From 7a338096583f581a4c2733802110f15e8a19e4a5 Mon Sep 17 00:00:00 2001
From: Brian Lee <brianjleeofcl@gmail.com>
Date: Sat, 27 May 2017 17:35:56 -0700
Subject: [PATCH 001/287] Allow subclass gm function to accept source types
 other than path strings

---
 types/gm/gm-tests.ts | 10 ++++++++++
 types/gm/index.d.ts  |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/types/gm/gm-tests.ts b/types/gm/gm-tests.ts
index e8bf5787cd..50c124ffc5 100644
--- a/types/gm/gm-tests.ts
+++ b/types/gm/gm-tests.ts
@@ -346,3 +346,13 @@ var imageMagick = gm.subClass({ imageMagick: true });
 var readStream = imageMagick(src)
 	.adjoin()
 	.stream();
+
+var passStream = imageMagick(readStream).stream();
+
+var buffers: Buffer[] = [];
+var buffer: Buffer;
+passStream.on('data', (chunk) => buffers.push(chunk as Buffer)).on('close', () => {
+	buffer = Buffer.concat(buffers);
+	var readstream = imageMagick(buffer).stream();
+})
+
diff --git a/types/gm/index.d.ts b/types/gm/index.d.ts
index 7fd419ede3..a08086e58e 100644
--- a/types/gm/index.d.ts
+++ b/types/gm/index.d.ts
@@ -615,6 +615,9 @@ declare namespace m {
 
     export interface SubClass {
         (image: string): State;
+        (stream: NodeJS.ReadableStream, image?: string): State
+        (buffer: Buffer, image?: string): State
+        (width: number, height: number, color?: string): State
     }
 
     export function compare(filename1: string, filename2: string, callback: CompareCallback): void;

From 803b84709699b305f8a84746c0c73bfb955725dc Mon Sep 17 00:00:00 2001
From: Brian Lee <brianjleeofcl@gmail.com>
Date: Tue, 30 May 2017 13:19:08 -0700
Subject: [PATCH 002/287] Rewrite overloaded function

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

diff --git a/types/gm/index.d.ts b/types/gm/index.d.ts
index a08086e58e..8da081ffd5 100644
--- a/types/gm/index.d.ts
+++ b/types/gm/index.d.ts
@@ -615,9 +615,9 @@ declare namespace m {
 
     export interface SubClass {
         (image: string): State;
-        (stream: NodeJS.ReadableStream, image?: string): State
-        (buffer: Buffer, image?: string): State
-        (width: number, height: number, color?: string): State
+        (stream: NodeJS.ReadableStream, image?: string): State;
+        (buffer: Buffer, image?: string): State;
+        (width: number, height: number, color?: string): State;
     }
 
     export function compare(filename1: string, filename2: string, callback: CompareCallback): void;

From ca9b0519317bb4b928fc1e6995e7904bd40cf9a8 Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <j.jimenez@tuta.io>
Date: Wed, 31 May 2017 22:19:38 +0100
Subject: [PATCH 003/287] move node-feedparser to /types

---
 types/node-feedparser/index.d.ts              | 166 ++++++++++++++++++
 .../node-feedparser/node-feedparser-tests.ts  |  32 ++++
 types/node-feedparser/tsconfig.json           |  22 +++
 types/node-feedparser/tslint.json             |   5 +
 4 files changed, 225 insertions(+)
 create mode 100644 types/node-feedparser/index.d.ts
 create mode 100644 types/node-feedparser/node-feedparser-tests.ts
 create mode 100644 types/node-feedparser/tsconfig.json
 create mode 100644 types/node-feedparser/tslint.json

diff --git a/types/node-feedparser/index.d.ts b/types/node-feedparser/index.d.ts
new file mode 100644
index 0000000000..bed830265c
--- /dev/null
+++ b/types/node-feedparser/index.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for feedparser 2.2
+// Project: http://github.com/danmactough/node-feedparser
+// Definitions by: Juan J. Jimenez-Anca <https://github.com/cortopy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/** Declaration file generated by dts-gen */
+
+/// <reference types="node" />
+
+import stream = require('stream');
+import { SAXStream } from 'sax';
+export = FeedParser;
+
+declare class FeedParser extends stream.Duplex {
+    constructor(options: FeedParser.Options);
+    options: FeedParser.Options;
+    stream: SAXStream;
+    meta: object;
+    _emitted_meta: boolean;
+    stack: any[];
+    xmlbase: any[];
+    in_xhtml: boolean;
+    xhtml: object;
+    errors: Error[];
+
+    addListener(ev: any, fn: any): any;
+
+    cork(): void;
+
+    eventNames(): any;
+
+    getMaxListeners(): any;
+
+    handleAttributes(attrs: FeedParser.Attrs, el: string): any;
+
+    handleCloseTag(el: string): void;
+
+    handleEnd(): any;
+
+    handleError(e: Error): void;
+
+    handleItem(node: FeedParser.Node, type: FeedParser.Type, options: FeedParser.Options): FeedParser.Item;
+
+    handleMeta(node: FeedParser.Node, type: FeedParser.Type, options: FeedParser.Options): FeedParser.Meta;
+
+    handleOpenTag(node: FeedParser.Node): void;
+
+    handleProcessingInstruction(node: FeedParser.Node): void;
+
+    handleSaxError(e: Error): void;
+
+    handleText(text: string): void;
+
+    init(): void;
+
+    isPaused(): any;
+
+    listenerCount(type: FeedParser.Type): any;
+
+    listeners(type: FeedParser.Type): any;
+
+    on(ev: any, fn: any): any;
+
+    pause(): any;
+
+    pipe(dest: any, pipeOpts: any): any;
+
+    push(chunk: any, encoding: any): any;
+
+    read(n?: number): FeedParser.Item;
+
+    removeAllListeners(type: FeedParser.Type, ...args: any[]): any;
+
+    resume(): any;
+
+    resumeSaxError(): void;
+
+    setDefaultEncoding(encoding: any): any;
+
+    setEncoding(enc: any): any;
+
+    setMaxListeners(n: any): any;
+    
+    uncork(): void;
+
+    unpipe(dest: any): any;
+
+    unshift(chunk: any): any;
+
+    wrap(stream: SAXStream, ...args: any[]): any;
+
+    private _transform(data: any, encoding: string, done: Function): void;
+    private _flush(done: Function): void;
+
+}
+
+declare namespace FeedParser {
+    type Type = "atom" | "rss" | "rdf";
+
+    interface Options {
+        normalize?: boolean;
+        addmeta?: boolean;
+        feedurl?: string;
+        resume_saxerror?: boolean;
+        MAX_BUFFER_LENGTH?: number;
+    }
+
+
+    interface Node {
+        [key: string]: any;
+    }
+
+    interface Attrs {
+        name: string;
+        value: any;
+        prefix: string;
+        local: string;
+        uri: string;
+    }
+
+    interface NS {
+        [key: string]: string;
+    }
+
+    interface Image {
+        url: string;
+        title: string;
+    }
+
+    interface Meta {
+        "#ns": NS[];
+        "#type": Type;
+        "#version": string;
+        title: string;
+        description: string;
+        date: Date | null;
+        pubdate: Date | null;
+        link: string;
+        xmlurl: string;
+        author: string;
+        language: string;
+        image: Image;
+        favicon: string;
+        copyright: string;
+        generator: string;
+        categories: string[];
+    }
+
+    interface Item {
+        title: string;
+        description: string;
+        summary: string;
+        date: Date | null;
+        pubdate: Date | null;
+        link: string;
+        origlink: string;
+        author: string;
+        guid: string;
+        comments: string;
+        image: Image;
+        categories: string[];
+        enclosures: string[];
+        meta: Meta;
+    }
+
+}
+
diff --git a/types/node-feedparser/node-feedparser-tests.ts b/types/node-feedparser/node-feedparser-tests.ts
new file mode 100644
index 0000000000..25d652de8c
--- /dev/null
+++ b/types/node-feedparser/node-feedparser-tests.ts
@@ -0,0 +1,32 @@
+import request = require('request');
+import * as FeedParser from "feedparser";
+
+const req = request('https://news.google.com/news?cf=all&hl=en&pz=1&ned=us&output=rss');
+const feedparser = new FeedParser({});
+
+req.on("error", error => {
+  // handle any request errors
+});
+
+req.on("response", res => {
+  if (res.statusCode !== 200) {
+    req.emit('error', new Error('Bad status code'));
+  } else {
+    req.pipe(feedparser);
+  }
+});
+
+feedparser.on('error', (error: Error) => {
+  // always handle errors
+});
+
+feedparser.on('readable', () => {
+  // This is where the action is!
+  const stream = feedparser;
+  const meta = feedparser.meta; // **NOTE** the "meta" is always available in the context of the feedparser instance
+  let item: FeedParser.Item;
+
+  while (item = stream.read()) {
+    console.log(item);
+  }
+});
diff --git a/types/node-feedparser/tsconfig.json b/types/node-feedparser/tsconfig.json
new file mode 100644
index 0000000000..31cb0cd3b7
--- /dev/null
+++ b/types/node-feedparser/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",
+        "node-feedparser-tests.ts"
+    ]
+}
diff --git a/types/node-feedparser/tslint.json b/types/node-feedparser/tslint.json
new file mode 100644
index 0000000000..5d0b359e47
--- /dev/null
+++ b/types/node-feedparser/tslint.json
@@ -0,0 +1,5 @@
+{ "extends": "dtslint/dt.json",
+  "rules": {
+    "no-conditional-assignment": false
+  }
+}

From d018245379f7bfb6d73466fa8d54530df35dd196 Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <j.jimenez@tuta.io>
Date: Wed, 31 May 2017 22:21:53 +0100
Subject: [PATCH 004/287] deleted node-feedparser from root

---
 node-feedparser/index.d.ts               | 166 -----------------------
 node-feedparser/node-feedparser-tests.ts |  32 -----
 node-feedparser/tsconfig.json            |  22 ---
 node-feedparser/tslint.json              |   5 -
 4 files changed, 225 deletions(-)
 delete mode 100644 node-feedparser/index.d.ts
 delete mode 100644 node-feedparser/node-feedparser-tests.ts
 delete mode 100644 node-feedparser/tsconfig.json
 delete mode 100644 node-feedparser/tslint.json

diff --git a/node-feedparser/index.d.ts b/node-feedparser/index.d.ts
deleted file mode 100644
index bed830265c..0000000000
--- a/node-feedparser/index.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// Type definitions for feedparser 2.2
-// Project: http://github.com/danmactough/node-feedparser
-// Definitions by: Juan J. Jimenez-Anca <https://github.com/cortopy>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/** Declaration file generated by dts-gen */
-
-/// <reference types="node" />
-
-import stream = require('stream');
-import { SAXStream } from 'sax';
-export = FeedParser;
-
-declare class FeedParser extends stream.Duplex {
-    constructor(options: FeedParser.Options);
-    options: FeedParser.Options;
-    stream: SAXStream;
-    meta: object;
-    _emitted_meta: boolean;
-    stack: any[];
-    xmlbase: any[];
-    in_xhtml: boolean;
-    xhtml: object;
-    errors: Error[];
-
-    addListener(ev: any, fn: any): any;
-
-    cork(): void;
-
-    eventNames(): any;
-
-    getMaxListeners(): any;
-
-    handleAttributes(attrs: FeedParser.Attrs, el: string): any;
-
-    handleCloseTag(el: string): void;
-
-    handleEnd(): any;
-
-    handleError(e: Error): void;
-
-    handleItem(node: FeedParser.Node, type: FeedParser.Type, options: FeedParser.Options): FeedParser.Item;
-
-    handleMeta(node: FeedParser.Node, type: FeedParser.Type, options: FeedParser.Options): FeedParser.Meta;
-
-    handleOpenTag(node: FeedParser.Node): void;
-
-    handleProcessingInstruction(node: FeedParser.Node): void;
-
-    handleSaxError(e: Error): void;
-
-    handleText(text: string): void;
-
-    init(): void;
-
-    isPaused(): any;
-
-    listenerCount(type: FeedParser.Type): any;
-
-    listeners(type: FeedParser.Type): any;
-
-    on(ev: any, fn: any): any;
-
-    pause(): any;
-
-    pipe(dest: any, pipeOpts: any): any;
-
-    push(chunk: any, encoding: any): any;
-
-    read(n?: number): FeedParser.Item;
-
-    removeAllListeners(type: FeedParser.Type, ...args: any[]): any;
-
-    resume(): any;
-
-    resumeSaxError(): void;
-
-    setDefaultEncoding(encoding: any): any;
-
-    setEncoding(enc: any): any;
-
-    setMaxListeners(n: any): any;
-    
-    uncork(): void;
-
-    unpipe(dest: any): any;
-
-    unshift(chunk: any): any;
-
-    wrap(stream: SAXStream, ...args: any[]): any;
-
-    private _transform(data: any, encoding: string, done: Function): void;
-    private _flush(done: Function): void;
-
-}
-
-declare namespace FeedParser {
-    type Type = "atom" | "rss" | "rdf";
-
-    interface Options {
-        normalize?: boolean;
-        addmeta?: boolean;
-        feedurl?: string;
-        resume_saxerror?: boolean;
-        MAX_BUFFER_LENGTH?: number;
-    }
-
-
-    interface Node {
-        [key: string]: any;
-    }
-
-    interface Attrs {
-        name: string;
-        value: any;
-        prefix: string;
-        local: string;
-        uri: string;
-    }
-
-    interface NS {
-        [key: string]: string;
-    }
-
-    interface Image {
-        url: string;
-        title: string;
-    }
-
-    interface Meta {
-        "#ns": NS[];
-        "#type": Type;
-        "#version": string;
-        title: string;
-        description: string;
-        date: Date | null;
-        pubdate: Date | null;
-        link: string;
-        xmlurl: string;
-        author: string;
-        language: string;
-        image: Image;
-        favicon: string;
-        copyright: string;
-        generator: string;
-        categories: string[];
-    }
-
-    interface Item {
-        title: string;
-        description: string;
-        summary: string;
-        date: Date | null;
-        pubdate: Date | null;
-        link: string;
-        origlink: string;
-        author: string;
-        guid: string;
-        comments: string;
-        image: Image;
-        categories: string[];
-        enclosures: string[];
-        meta: Meta;
-    }
-
-}
-
diff --git a/node-feedparser/node-feedparser-tests.ts b/node-feedparser/node-feedparser-tests.ts
deleted file mode 100644
index 25d652de8c..0000000000
--- a/node-feedparser/node-feedparser-tests.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import request = require('request');
-import * as FeedParser from "feedparser";
-
-const req = request('https://news.google.com/news?cf=all&hl=en&pz=1&ned=us&output=rss');
-const feedparser = new FeedParser({});
-
-req.on("error", error => {
-  // handle any request errors
-});
-
-req.on("response", res => {
-  if (res.statusCode !== 200) {
-    req.emit('error', new Error('Bad status code'));
-  } else {
-    req.pipe(feedparser);
-  }
-});
-
-feedparser.on('error', (error: Error) => {
-  // always handle errors
-});
-
-feedparser.on('readable', () => {
-  // This is where the action is!
-  const stream = feedparser;
-  const meta = feedparser.meta; // **NOTE** the "meta" is always available in the context of the feedparser instance
-  let item: FeedParser.Item;
-
-  while (item = stream.read()) {
-    console.log(item);
-  }
-});
diff --git a/node-feedparser/tsconfig.json b/node-feedparser/tsconfig.json
deleted file mode 100644
index 31cb0cd3b7..0000000000
--- a/node-feedparser/tsconfig.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "node-feedparser-tests.ts"
-    ]
-}
diff --git a/node-feedparser/tslint.json b/node-feedparser/tslint.json
deleted file mode 100644
index 5d0b359e47..0000000000
--- a/node-feedparser/tslint.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "extends": "dtslint/dt.json",
-  "rules": {
-    "no-conditional-assignment": false
-  }
-}

From 5433f5e434ff90d8a185f6e10ab69ca50f753710 Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <j.jimenez@tuta.io>
Date: Wed, 31 May 2017 22:35:16 +0100
Subject: [PATCH 005/287] changes after tests

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

diff --git a/types/node-feedparser/index.d.ts b/types/node-feedparser/index.d.ts
index bed830265c..775a4a7fa0 100644
--- a/types/node-feedparser/index.d.ts
+++ b/types/node-feedparser/index.d.ts
@@ -14,12 +14,16 @@ declare class FeedParser extends stream.Duplex {
     constructor(options: FeedParser.Options);
     options: FeedParser.Options;
     stream: SAXStream;
-    meta: object;
+    meta: {
+        [key: string]: any
+    };
     _emitted_meta: boolean;
     stack: any[];
     xmlbase: any[];
     in_xhtml: boolean;
-    xhtml: object;
+    xhtml: {
+        [key: string]: any
+    };
     errors: Error[];
 
     addListener(ev: any, fn: any): any;
@@ -79,7 +83,7 @@ declare class FeedParser extends stream.Duplex {
     setEncoding(enc: any): any;
 
     setMaxListeners(n: any): any;
-    
+
     uncork(): void;
 
     unpipe(dest: any): any;
@@ -88,9 +92,8 @@ declare class FeedParser extends stream.Duplex {
 
     wrap(stream: SAXStream, ...args: any[]): any;
 
-    private _transform(data: any, encoding: string, done: Function): void;
-    private _flush(done: Function): void;
-
+    private _transform(data: any, encoding: string, done: () => any): void;
+    private _flush(done: () => any): void;
 }
 
 declare namespace FeedParser {
@@ -104,7 +107,6 @@ declare namespace FeedParser {
         MAX_BUFFER_LENGTH?: number;
     }
 
-
     interface Node {
         [key: string]: any;
     }
@@ -161,6 +163,4 @@ declare namespace FeedParser {
         enclosures: string[];
         meta: Meta;
     }
-
 }
-
diff --git a/types/node-feedparser/node-feedparser-tests.ts b/types/node-feedparser/node-feedparser-tests.ts
index 25d652de8c..f36698372b 100644
--- a/types/node-feedparser/node-feedparser-tests.ts
+++ b/types/node-feedparser/node-feedparser-tests.ts
@@ -1,5 +1,5 @@
 import request = require('request');
-import * as FeedParser from "feedparser";
+import * as FeedParser from "node-feedparser";
 
 const req = request('https://news.google.com/news?cf=all&hl=en&pz=1&ned=us&output=rss');
 const feedparser = new FeedParser({});

From f2df68de0198be12917aab48e1aafe2c4a8812b0 Mon Sep 17 00:00:00 2001
From: Nicolas Voigt <nicolas@voigt.link>
Date: Wed, 21 Jun 2017 12:20:28 +0200
Subject: [PATCH 006/287] modified crypto.verfier.verify

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 952cf98e4d..3f8b5d5a4a 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -3632,8 +3632,10 @@ declare module "crypto" {
     export interface Verify extends NodeJS.WritableStream {
         update(data: string | Buffer): Verify;
         update(data: string | Buffer, input_encoding: Utf8AsciiLatin1Encoding): Verify;
-        verify(object: string, signature: Buffer): boolean;
-        verify(object: string, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
+        verify(object: string | Object, signature: Buffer | DataView): boolean;
+        verify(object: string | Object, signature: string, signature_format: HexBase64Latin1Encoding): boolean;
+        // https://nodejs.org/api/crypto.html#crypto_verifier_verify_object_signature_signature_format
+        // The signature field accepts a TypedArray type, but it is only available starting ES2017
     }
     export function createDiffieHellman(prime_length: number, generator?: number): DiffieHellman;
     export function createDiffieHellman(prime: Buffer): DiffieHellman;

From 9d510d71fe139f72b6ae16af24798a732521c845 Mon Sep 17 00:00:00 2001
From: Nicolas Voigt <nicolas@voigt.link>
Date: Wed, 21 Jun 2017 12:55:06 +0200
Subject: [PATCH 007/287] added author reference

---
 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 3f8b5d5a4a..647bf30cc6 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6,6 +6,7 @@
 //                 Roberto Desideri <https://github.com/RobDesideri>
 //                 Christian Vaagland Tellnes <https://github.com/tellnes>
 //                 Wilco Bakker <https://github.com/WilcoBakker>
+//                 Nicolas Voigt <https://github.com/octo-sniffle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From e86d4cc1269863ef3f8505f119bd689d21f701ea Mon Sep 17 00:00:00 2001
From: Sebastien PUECH <sebastien.puech@pi.esisar.grenoble-inp.fr>
Date: Thu, 22 Jun 2017 08:52:51 +0200
Subject: [PATCH 008/287] Fixup for "node" types, fs.createReadStream and
 fs.createWriteStream functions.

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 952cf98e4d..423fae41f1 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2497,6 +2497,7 @@ declare module "dgram" {
 declare module "fs" {
     import * as stream from "stream";
     import * as events from "events";
+    import * as url from "url";
 
     interface Stats {
         isFile(): boolean;
@@ -2975,7 +2976,7 @@ declare module "fs" {
     export function access(path: string | Buffer, mode: number, callback: (err: NodeJS.ErrnoException) => void): void;
     /** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */
     export function accessSync(path: string | Buffer, mode?: number): void;
-    export function createReadStream(path: string | Buffer, options?: {
+    export function createReadStream(path: string | Buffer | url.URL, options?: string | {
         flags?: string;
         encoding?: string;
         fd?: number;
@@ -2984,9 +2985,9 @@ declare module "fs" {
         start?: number;
         end?: number;
     }): ReadStream;
-    export function createWriteStream(path: string | Buffer, options?: {
+    export function createWriteStream(path: string | Buffer | url.URL, options?: string | {
         flags?: string;
-        encoding?: string;
+        defaultEncoding?: string;
         fd?: number;
         mode?: number;
         autoClose?: boolean;

From 825083d238d7dc3ec72251960c74dfa70b6f08d5 Mon Sep 17 00:00:00 2001
From: Sebastien PUECH <sebastien.puech@pi.esisar.grenoble-inp.fr>
Date: Thu, 22 Jun 2017 16:57:50 +0200
Subject: [PATCH 009/287] Fixed the bind method for UDP.

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 423fae41f1..f1fbefbd0a 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2437,6 +2437,8 @@ declare module "dgram" {
         send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
         send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void;
         bind(port?: number, address?: string, callback?: () => void): void;
+        bind(port?: number, callback?: () => void): void;
+        bind(callback?: () => void): void;
         bind(options: BindOptions, callback?: Function): void;
         close(callback?: () => void): void;
         address(): AddressInfo;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index aeefc2bbdc..3bb2ddcc69 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -1045,6 +1045,10 @@ namespace dgram_tests {
     });
     ds.bind();
     ds.bind(41234);
+    ds.bind(4123, 'localhost');
+    ds.bind(4123, 'localhost', () => {});
+    ds.bind(4123, () => {});
+    ds.bind(() => {});
     var ai: dgram.AddressInfo = ds.address();
     ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
     });

From 3c34fad19420946701afa98b71a228f3e26ffd26 Mon Sep 17 00:00:00 2001
From: codemannz <codeman_nz@hotmail.com>
Date: Fri, 23 Jun 2017 13:31:50 +1200
Subject: [PATCH 010/287] Updated Application to include root region

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

diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 8b3d338293..d8ced49217 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -1265,17 +1265,17 @@ declare namespace Marionette {
          */
         start(options?: any): void;
 
-        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
-        addRegions(regions: any): any;
+        /** Root region of the application*/
+        region: string;
 
-        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
-        emptyRegions(): void;
+        /** Get the root region */
+        getRegion(): Region;
 
-        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
-        removeRegion(region: Region): void;
+        /** Show a view in the root region */
+        showView(view: any): void;
 
-        /** Deprecated! nstead of using the Application as the root of your view tree, you should use a Layout View.*/
-        getRegion(regionName: string): Region;
+        /** Get the view from the root region*/
+        getView(): any;
 
         module(moduleNames: any, moduleDefinition: any): Module;
 

From 8f052a8a694b7e5ba7d3e00465590841257b4347 Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <d3ivi2kas@windowslive.com>
Date: Fri, 23 Jun 2017 22:05:48 +0300
Subject: [PATCH 011/287] TSLint added.

---
 types/react-swipeable-views/tslint.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 types/react-swipeable-views/tslint.json

diff --git a/types/react-swipeable-views/tslint.json b/types/react-swipeable-views/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-swipeable-views/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1c30bc4857c6b46dbe94e67aaebc076b4ba283e1 Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <d3ivi2kas@windowslive.com>
Date: Fri, 23 Jun 2017 22:06:32 +0300
Subject: [PATCH 012/287] TSLint warnings resolved in `index.d.ts` and
 `react-swipeable-views-tests.ts`.

---
 types/react-swipeable-views/index.d.ts             | 14 +++++++++-----
 .../react-swipeable-views-tests.ts                 | 13 ++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/types/react-swipeable-views/index.d.ts b/types/react-swipeable-views/index.d.ts
index 068a4e8ee6..b146983efa 100644
--- a/types/react-swipeable-views/index.d.ts
+++ b/types/react-swipeable-views/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for react-swipeable-views
+// Type definitions for react-swipeable-views 0.12
 // Project: https://github.com/oliviertassinari/react-swipeable-views
 // Definitions by: Michael Ledin <https://github.com/mxl>
+//                 Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -8,13 +9,16 @@ import * as React from 'react';
 
 export as namespace ReactSwipeableViews;
 
+export type OnChangeIndexCallback = (indexNew: number, indexLatest: number) => void;
+export type OnSwitchingCallback = (index: number) => void;
+
 declare namespace ReactSwipeableViews {
-    export interface SwipeableViewsProps extends React.Props<SwipeableViews> {
+    interface SwipeableViewsProps extends React.Props<SwipeableViews> {
         containerStyle?: React.CSSProperties;
         disabled?: boolean;
         index?: number;
-        onChangeIndex?: (indexNew:number, indexLatest:number) => void;
-        onSwitching?: (index:number) => void;
+        onChangeIndex?: OnChangeIndexCallback;
+        onSwitching?: OnSwitchingCallback;
         resistance?: boolean;
         slideStyle?: React.CSSProperties;
         style?: React.CSSProperties;
@@ -29,7 +33,7 @@ declare namespace ReactSwipeableViews {
         heightLatest?: number;
     }
 
-    export class SwipeableViews extends React.Component<SwipeableViewsProps, SwipeableViewsState> {
+    class SwipeableViews extends React.Component<SwipeableViewsProps, SwipeableViewsState> {
     }
 }
 
diff --git a/types/react-swipeable-views/react-swipeable-views-tests.ts b/types/react-swipeable-views/react-swipeable-views-tests.ts
index c608f065f4..bb31b7e2fe 100644
--- a/types/react-swipeable-views/react-swipeable-views-tests.ts
+++ b/types/react-swipeable-views/react-swipeable-views-tests.ts
@@ -1,15 +1,15 @@
 import * as React from 'react';
 import SwipeableViews from 'react-swipeable-views';
 
-const onChangeIndex = (indexNew:number, indexLatest:number) => {
+const onChangeIndex = (indexNew: number, indexLatest: number) => {
     console.log('New index: ' + indexNew + ', latest index' + indexLatest);
 };
 
-const onSwitching = (index:number) => {
+const onSwitching = (index: number) => {
     console.log('Switching to ' + index);
 };
 
-const style:React.CSSProperties = {
+const style: React.CSSProperties = {
     height: 300
 };
 
@@ -17,13 +17,12 @@ React.createElement(SwipeableViews, {
     containerStyle: style,
     disabled: false,
     index: 0,
-    onChangeIndex: onChangeIndex,
-    onSwitching: onSwitching,
+    onChangeIndex,
+    onSwitching,
     resistance: false,
     slideStyle: style,
-    style: style,
+    style,
     threshold: 100
 });
 
-
 React.createElement(SwipeableViews, {});

From 4e5add2f779115c98139e38fbae4d3dd2a6c5ae0 Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Fri, 23 Jun 2017 23:16:05 -0400
Subject: [PATCH 013/287] Fixed isArray type guards (#16077)

---
 types/lodash/index.d.ts      |  42 ++++++++++-
 types/lodash/lodash-tests.ts | 137 +++++++++++++++++++++++++++--------
 2 files changed, 145 insertions(+), 34 deletions(-)

diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index bb0b7b7f9d..910e29bd95 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -9604,7 +9604,6 @@ declare namespace _ {
         some<TResult>(
             predicate?: ListIterator<TResult, boolean>|DictionaryIterator<TResult, boolean>|NumericDictionaryIterator<T, boolean>|ObjectIterator<any, boolean>
         ): boolean;
-
         /**
          * @see _.some
          */
@@ -11990,7 +11989,12 @@ declare namespace _ {
          *
          * @return Returns true if value is correctly classified, else false.
          */
-        isArray<T>(value?: any): value is T[];
+        isArray(value?: any): value is any[];
+
+        /**
+         * DEPRECATED
+         */
+        isArray<T>(value?: any): value is any[];
     }
 
     interface LoDashImplicitWrapperBase<T, TWrapper> {
@@ -12059,7 +12063,22 @@ declare namespace _ {
          * _.isArrayLike(_.noop);
          * // => false
          */
-        isArrayLike<T>(value?: any): value is T[];
+        isArrayLike<T>(value: T & string & number): boolean; // should only match if T = any
+    
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLike(value?: Function): value is never;
+    
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLike<T>(value: T | Function): value is T & { length: number };
+    
+        /**
+         * DEPRECATED
+         */
+        isArrayLike<T>(value?: any): value is any[];
     }
 
     interface LoDashImplicitWrapperBase<T, TWrapper> {
@@ -12102,7 +12121,22 @@ declare namespace _ {
          * _.isArrayLikeObject(_.noop);
          * // => false
          */
-        isArrayLikeObject<T>(value?: any): value is T[];
+        isArrayLikeObject<T>(value: T & string & number): boolean; // should only match if T = any
+    
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLikeObject(value?: Function | string | boolean | number): value is never;
+    
+        /**
+         * @see _.isArrayLike
+         */
+        isArrayLikeObject<T>(value: T | Function | string | boolean | number): value is T & { length: number };
+    
+        /**
+         * DEPRECATED
+         */
+        isArrayLikeObject<T>(value?: any): value is any[];
     }
 
     interface LoDashImplicitWrapperBase<T, TWrapper> {
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index d69529e0dd..a11485ca07 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -6892,18 +6892,13 @@ namespace TestisArguments {
 // _.isArray
 namespace TestIsArray {
     {
-        let value: number|string[]|boolean[] = [];
+        let value: number|string[]|boolean[] = any;
 
-        if (_.isArray<string>(value)) {
-            let result: string[] = value;
+        if (_.isArray(value)) {
+            value; // $ExpectType boolean[] | string[]
         }
         else {
-            if (_.isArray<boolean>(value)) {
-                let result: boolean[] = value;
-            }
-            else {
-                let result: number = value;
-            }
+            value; // $ExpectType number
         }
     }
 
@@ -6928,13 +6923,13 @@ namespace TestIsArray {
 // _.isArrayBuffer
 namespace TestIsArrayBuffer {
     {
-        let value: ArrayBuffer|number = 0;
+        let value: ArrayBuffer|number = any;
 
         if (_.isArrayBuffer(value)) {
-            let result: ArrayBuffer = value;
+            value; // $ExpectType ArrayBuffer
         }
         else {
-            let result: number = value;
+            value; // $ExpectType number
         }
     }
 
@@ -6959,18 +6954,59 @@ namespace TestIsArrayBuffer {
 // _.isArrayLike
 namespace TestIsArrayLike {
     {
-        let value: number|string[]|boolean[] = [];
+        let value: string | string[] | { [index: number]: boolean, length: number } | [number, boolean]
+            | number | Function | { length: string } | { a: string }
+            = any;
 
-        if (_.isArrayLike<string>(value)) {
-            let result: string[] = value;
+        if (_.isArrayLike(value)) {
+            let result: string | string[] | { [index: number]: boolean, length: number } | [number, boolean] = value;
         }
         else {
-            if (_.isArrayLike<boolean>(value)) {
-                let result: boolean[] = value;
-            }
-            else {
-                let result: number = value;
-            }
+            let result: number | Function | { length: string } | { a: string; } = value;
+        }
+    }
+
+    {
+        let value: boolean[] = any;
+
+        if (_.isArrayLike(value)) {
+            let result: boolean[] = value;
+        }
+        else {
+            value; // $ExpectType never
+        }
+    }
+
+    {
+        let value: Function = any;
+
+        if (_.isArrayLike(value)) {
+            value; // $ExpectType never
+        }
+        else {
+            value; // $ExpectType Function
+        }
+    }
+
+    {
+        let value: { a: string } = any;
+
+        if (_.isArrayLike(value)) {
+            let result: { a: string, length: number } = value;
+        }
+        else {
+            value; // $ExpectType { a: string; }
+        }
+    }
+
+    {
+        let value: any = any;
+
+        if (_.isArrayLike(value)) {
+            value; // $ExpectType any
+        }
+        else {
+            value; // $ExpectType any
         }
     }
 
@@ -6995,18 +7031,59 @@ namespace TestIsArrayLike {
 // _.isArrayLikeObject
 namespace TestIsArrayLikeObject {
     {
-        let value: number|string[]|boolean[] = [];
+        let value: string[] | { [index: number]: boolean, length: number } | [number, boolean]
+            | number | string | Function | { length: string } | { a: string }
+            = any;
 
-        if (_.isArrayLikeObject<string>(value)) {
-            let result: string[] = value;
+        if (_.isArrayLikeObject(value)) {
+            let result: string[] | { [index: number]: boolean, length: number } | [number, boolean] = value;
         }
         else {
-            if (_.isArrayLikeObject<boolean>(value)) {
-                let result: boolean[] = value;
-            }
-            else {
-                let result: number = value;
-            }
+            let result: string | number | Function | { length: string; } | { a: string; } = value;
+        }
+    }
+
+    {
+        let value: boolean[] = any;
+
+        if (_.isArrayLikeObject(value)) {
+            let result: boolean[] = value;
+        }
+        else {
+            value; // $ExpectType never
+        }
+    }
+
+    {
+        let value: string | Function = any;
+
+        if (_.isArrayLikeObject(value)) {
+            value; // $ExpectType never
+        }
+        else {
+            value; // $ExpectType string | Function
+        }
+    }
+
+    {
+        let value: { a: string } = any;
+
+        if (_.isArrayLikeObject(value)) {
+            let result: { a: string, length: number } = value;
+        }
+        else {
+            value; // $ExpectType { a: string; }
+        }
+    }
+
+    {
+        let value: any = any;
+
+        if (_.isArrayLikeObject(value)) {
+            value; // $ExpectType any
+        }
+        else {
+            value; // $ExpectType any
         }
     }
 

From 75268d7bc7ebf79de1914baa16443f3cc440b775 Mon Sep 17 00:00:00 2001
From: Alessio Fanelli <fanahova@gmail.com>
Date: Sat, 24 Jun 2017 12:57:14 +0200
Subject: [PATCH 014/287] Add more Chart.js definitions

---
 types/chartjs/chartjs-tests.ts | 25 ++++++++++++++++--
 types/chartjs/index.d.ts       | 47 ++++++++++++++++++++++++++++++++--
 2 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/types/chartjs/chartjs-tests.ts b/types/chartjs/chartjs-tests.ts
index d6b47d45bf..ef50da1b40 100644
--- a/types/chartjs/chartjs-tests.ts
+++ b/types/chartjs/chartjs-tests.ts
@@ -51,12 +51,14 @@ var lineData: LinearChartData = {
     datasets: [
         {
             label: 'Accepted',
+            type: 'bar',
             fillColor: 'rgba(220,220,220,0.2)',
             strokeColor: 'rgba(220,220,220,1)',
             pointColor: 'rgba(220,220,220,1)',
             pointStrokeColor: '#fff',
             pointHighlightFill: '#fff',
             pointHighlightStroke: 'rgba(220,220,220,1)',
+            borderColor: "#9b0391",
             data: [65, 59, 80, 81, 56, 55, 40]
         },
         {
@@ -67,7 +69,8 @@ var lineData: LinearChartData = {
             pointStrokeColor: '#fff',
             pointHighlightFill: '#fff',
             pointHighlightStroke: 'rgba(151,187,205,1)',
-            data: [28, 48, 40, 19, 86, 27, 90]
+            data: [28, 48, 40, 19, 86, 27, 90],
+            yAxisID: 'quarantined'
         }
     ]
 };
@@ -85,6 +88,21 @@ var myLineChart = new Chart(ctx).Line(lineData, {
     datasetStroke: true,
     datasetStrokeWidth: 2,
     datasetFill: true,
+    scales: {
+      xAxes: [{
+        stacked: true,
+      }],
+      yAxes: [{
+        position: "left",
+        "id": "users"
+      }, {
+        position: "right",
+        "id": "ratio",
+        ticks: {
+          min: -13
+        }
+      }]
+    },
     legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
 });
 
@@ -129,6 +147,10 @@ var myBarChart = new Chart(ctx).Bar(barData, {
     barStrokeWidth: 2,
     barValueSpacing: 5,
     barDatasetSpacing: 1,
+    legend: {
+      display: true,
+      position: 'bottom'
+    },
     legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<datasets.length; i++){%><li><span style=\"background-color:<%=datasets[i].lineColor%>\"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>"
 });
 
@@ -369,4 +391,3 @@ var my2ndRadarChart = new Chart(ctx).Radar(radarData, partialOpts);
 var my2ndPolarAreaChart = new Chart(ctx).PolarArea(polarAreaData, partialOpts);
 var my2ndPieChart = new Chart(ctx).Pie(pieData, partialOpts);
 var my2ndDoughnutChart = new Chart(ctx).Doughnut(pieData, partialOpts);
-
diff --git a/types/chartjs/index.d.ts b/types/chartjs/index.d.ts
index fca81b6d22..88c0a507fe 100644
--- a/types/chartjs/index.d.ts
+++ b/types/chartjs/index.d.ts
@@ -1,13 +1,18 @@
 // Type definitions for Chart.js
 // Project: https://github.com/nnnick/Chart.js
 // Definitions by: Steve Fenton <https://github.com/Steve-Fenton>
+//                 Alessio Fanelli <https://github.com/FanaHOVA>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface ChartDataSet {
     label: string;
     fillColor: string;
     strokeColor: string;
+    type?: string;
+    yAxisID?: string;
+    xAxisID?: string;
 
+    borderColor?: string;
     /* Line, Radar */
     pointColor?: string;
     pointStrokeColor?: string;
@@ -17,6 +22,8 @@ interface ChartDataSet {
     /* Bar */
     highlightFill?: string;
     highlightStroke?: string;
+    backgroundColorHover?: string;
+
     data: number[];
 }
 
@@ -80,8 +87,44 @@ interface ChartOptions extends ChartSettings {
     scaleGridLineColor?: string;
     scaleGridLineWidth?: number;
     scaleShowHorizontalLines?: boolean;
-    scaleShowVerticalLines?: boolean;  
+    scaleShowVerticalLines?: boolean;
     legendTemplate?: string;
+    tooltips?: ChartTooltips;
+    legend?: ChartLegend;
+    scales?: ChartScales;
+    title?: ChartTitle;
+}
+
+interface ChartTooltips {
+  mode?: string;
+  intersect?: boolean;
+}
+
+interface ChartLegend {
+  display?: boolean;
+  position?: string;
+}
+
+interface ChartScales {
+  xAxes?: Array<ChartScalesOptions>;
+  yAxes?: Array<ChartScalesOptions>;
+}
+
+interface ChartScalesOptions {
+  stacked?: boolean;
+  position?: string;
+  id?: string;
+  ticks?: ScaleTicksOptions;
+}
+
+interface ScaleTicksOptions {
+  min?: number;
+  max?: number;
+}
+
+interface ChartTitle {
+  display?: boolean;
+  text?: string;
 }
 
 interface PointsAtEvent {
@@ -137,7 +180,7 @@ interface BarChartOptions extends ChartOptions {
     barShowStroke?: boolean;
     barStrokeWidth?: number;
     barValueSpacing?: number;
-    barDatasetSpacing?: number;  
+    barDatasetSpacing?: number;
 }
 
 interface RadarChartOptions extends ChartSettings {

From 7af9261e86af3a2c0cf774b60a4acf89bdb70716 Mon Sep 17 00:00:00 2001
From: Alessio Fanelli <fanahova@gmail.com>
Date: Sat, 24 Jun 2017 13:01:20 +0200
Subject: [PATCH 015/287] Use 4 spaces

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

diff --git a/types/chartjs/index.d.ts b/types/chartjs/index.d.ts
index 88c0a507fe..a9075e02a2 100644
--- a/types/chartjs/index.d.ts
+++ b/types/chartjs/index.d.ts
@@ -96,35 +96,35 @@ interface ChartOptions extends ChartSettings {
 }
 
 interface ChartTooltips {
-  mode?: string;
-  intersect?: boolean;
+    mode?: string;
+    intersect?: boolean;
 }
 
 interface ChartLegend {
-  display?: boolean;
-  position?: string;
+    display?: boolean;
+    position?: string;
 }
 
 interface ChartScales {
-  xAxes?: Array<ChartScalesOptions>;
-  yAxes?: Array<ChartScalesOptions>;
+    xAxes?: Array<ChartScalesOptions>;
+    yAxes?: Array<ChartScalesOptions>;
 }
 
 interface ChartScalesOptions {
-  stacked?: boolean;
-  position?: string;
-  id?: string;
-  ticks?: ScaleTicksOptions;
+    stacked?: boolean;
+    position?: string;
+    id?: string;
+    ticks?: ScaleTicksOptions;
 }
 
 interface ScaleTicksOptions {
-  min?: number;
-  max?: number;
+    min?: number;
+    max?: number;
 }
 
 interface ChartTitle {
-  display?: boolean;
-  text?: string;
+    display?: boolean;
+    text?: string;
 }
 
 interface PointsAtEvent {

From 725f7676c5c38639fc4767792975caae01b89ff5 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Jun 2017 09:14:00 -0400
Subject: [PATCH 016/287] [jquery] Add more tests for JQueryStatic.

---
 types/jquery/jquery-tests.ts | 101 +++++++++++++++++++++++++++++++++--
 1 file changed, 96 insertions(+), 5 deletions(-)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 7a05a5630a..88cf87c95c 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3531,6 +3531,58 @@ function JQueryStatic() {
         $();
     }
 
+    function Event() {
+        // #ExpectType Event<HTMLElement>
+        $.Event;
+    }
+
+    function cssHooks() {
+        // #ExpectType PlainObject<CSSHook<HTMLElement>>
+        $.cssHooks;
+    }
+
+    function cssNumber() {
+        // #ExpectType PlainObject<boolean>
+        $.cssNumber;
+    }
+
+    function fn() {
+        // #ExpectType JQuery<HTMLElement>
+        $.fn;
+    }
+
+    function fx() {
+        function interval() {
+            // #ExpectType JQuery<number>
+            $.fx.interval;
+        }
+
+        function off() {
+            // #ExpectType boolean
+            $.fx.off;
+        }
+
+        function step() {
+            // #ExpectType PlainObject<AnimationHook<HTMLElement>>
+            $.fx.step;
+        }
+    }
+
+    function ready() {
+        // #ExpectType Thenable<JQueryStatic<HTMLElement>>
+        $.ready;
+    }
+
+    function support() {
+        // #ExpectType PlainObject
+        $.support;
+    }
+
+    function valHooks() {
+        // #ExpectType PlainObject<ValHook<HTMLElement>>
+        $.valHooks;
+    }
+
     function Callbacks() {
         // #ExpectType Callbacks
         $.Callbacks('once');
@@ -3539,11 +3591,50 @@ function JQueryStatic() {
         $.Callbacks();
     }
 
-    function Event() {
-        function constructor() {
-            const e = $.Event('click');
-            e.stopPropagation();
-        }
+    function Deferred() {
+        // #ExpectType Deferred<boolean, string, number>
+        $.Deferred<boolean, string, number>(function(deferred) {
+            // #ExpectType Deferred<boolean, string, number>
+            this;
+            // #ExpectType Deferred<boolean, string, number>
+            deferred;
+        });
+
+        // #ExpectType Deferred<boolean, string, number>
+        $.Deferred<boolean, string, number>();
+
+        // #ExpectType Deferred<boolean, string, any>
+        $.Deferred<boolean, string>(function(deferred) {
+            // #ExpectType Deferred<boolean, string, any>
+            this;
+            // #ExpectType Deferred<boolean, string, any>
+            deferred;
+        });
+
+        // #ExpectType Deferred<boolean, string, any>
+        $.Deferred<boolean, string>();
+
+        // #ExpectType Deferred<boolean, any, any>
+        $.Deferred<boolean>(function(deferred) {
+            // #ExpectType Deferred<boolean, any, any>
+            this;
+            // #ExpectType Deferred<boolean, any, any>
+            deferred;
+        });
+
+        // #ExpectType Deferred<boolean, any, any>
+        $.Deferred<boolean>();
+
+        // #ExpectType Deferred<any, any, any>
+        $.Deferred(function(deferred) {
+            // #ExpectType Deferred<any, any, any>
+            this;
+            // #ExpectType Deferred<any, any, any>
+            deferred;
+        });
+
+        // #ExpectType Deferred<any, any, any>
+        $.Deferred();
     }
 
     function ajax() {

From 7ddee109a1fdcd06635215151fcafa143f858845 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Jun 2017 09:46:10 -0400
Subject: [PATCH 017/287] [jquery] Updated AjaxSettings.

---
 types/jquery/index.d.ts | 276 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 271 insertions(+), 5 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index ce32477d98..eb41fd1845 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3482,7 +3482,7 @@ declare namespace JQuery {
              * XMLHttpRequest value can be changed here. Values in the headers setting can also be overwritten from
              * within the beforeSend function.
              */
-            headers?: PlainObject;
+            headers?: PlainObject<string | null | undefined>;
             /**
              * Allow the request to be successful only if the response has changed since the last request. This is
              * done by checking the Last-Modified header. Default value is false, ignoring the header. In jQuery
@@ -3578,6 +3578,7 @@ declare namespace JQuery {
              * A username to be used with XMLHttpRequest in response to an HTTP access authentication request.
              */
             username?: string;
+            // ActiveXObject requires "lib": ["scripthost"] which consumers would also require
             /**
              * Callback for creating the XMLHttpRequest object. Defaults to the ActiveXObject when available (IE),
              * the XMLHttpRequest otherwise. Override to provide your own implementation for XMLHttpRequest or
@@ -3591,12 +3592,14 @@ declare namespace JQuery {
              * requests requiring it would ignore this flag. For this reason, we recommend using jQuery 1.5.1+
              * should you require the use of it.
              */
-            xhrFields?: PlainObject;
+            xhrFields?: XHRFields;
         }
 
-        // Status codes not listed require type annotations when defining the callback
         type StatusCodeCallbacks<TContext> = {
+            // region Success Status Codes
+
             // jQuery treats 2xx and 304 status codes as a success
+
             200?: SuccessCallback<TContext>;
             201?: SuccessCallback<TContext>;
             202?: SuccessCallback<TContext>;
@@ -3699,7 +3702,10 @@ declare namespace JQuery {
             299?: SuccessCallback<TContext>;
             304?: SuccessCallback<TContext>;
 
-            // Standard 3xx, 4xx, and 5xx status codes that are considered an error
+            // endregion
+
+            // region Error Status Codes
+
             300?: ErrorCallback<TContext>;
             301?: ErrorCallback<TContext>;
             302?: ErrorCallback<TContext>;
@@ -3708,6 +3714,97 @@ declare namespace JQuery {
             306?: ErrorCallback<TContext>;
             307?: ErrorCallback<TContext>;
             308?: ErrorCallback<TContext>;
+            309?: ErrorCallback<TContext>;
+            310?: ErrorCallback<TContext>;
+            311?: ErrorCallback<TContext>;
+            312?: ErrorCallback<TContext>;
+            313?: ErrorCallback<TContext>;
+            314?: ErrorCallback<TContext>;
+            315?: ErrorCallback<TContext>;
+            316?: ErrorCallback<TContext>;
+            317?: ErrorCallback<TContext>;
+            318?: ErrorCallback<TContext>;
+            319?: ErrorCallback<TContext>;
+            320?: ErrorCallback<TContext>;
+            321?: ErrorCallback<TContext>;
+            322?: ErrorCallback<TContext>;
+            323?: ErrorCallback<TContext>;
+            324?: ErrorCallback<TContext>;
+            325?: ErrorCallback<TContext>;
+            326?: ErrorCallback<TContext>;
+            327?: ErrorCallback<TContext>;
+            328?: ErrorCallback<TContext>;
+            329?: ErrorCallback<TContext>;
+            330?: ErrorCallback<TContext>;
+            331?: ErrorCallback<TContext>;
+            332?: ErrorCallback<TContext>;
+            333?: ErrorCallback<TContext>;
+            334?: ErrorCallback<TContext>;
+            335?: ErrorCallback<TContext>;
+            336?: ErrorCallback<TContext>;
+            337?: ErrorCallback<TContext>;
+            338?: ErrorCallback<TContext>;
+            339?: ErrorCallback<TContext>;
+            340?: ErrorCallback<TContext>;
+            341?: ErrorCallback<TContext>;
+            342?: ErrorCallback<TContext>;
+            343?: ErrorCallback<TContext>;
+            344?: ErrorCallback<TContext>;
+            345?: ErrorCallback<TContext>;
+            346?: ErrorCallback<TContext>;
+            347?: ErrorCallback<TContext>;
+            348?: ErrorCallback<TContext>;
+            349?: ErrorCallback<TContext>;
+            350?: ErrorCallback<TContext>;
+            351?: ErrorCallback<TContext>;
+            352?: ErrorCallback<TContext>;
+            353?: ErrorCallback<TContext>;
+            354?: ErrorCallback<TContext>;
+            355?: ErrorCallback<TContext>;
+            356?: ErrorCallback<TContext>;
+            357?: ErrorCallback<TContext>;
+            358?: ErrorCallback<TContext>;
+            359?: ErrorCallback<TContext>;
+            360?: ErrorCallback<TContext>;
+            361?: ErrorCallback<TContext>;
+            362?: ErrorCallback<TContext>;
+            363?: ErrorCallback<TContext>;
+            364?: ErrorCallback<TContext>;
+            365?: ErrorCallback<TContext>;
+            366?: ErrorCallback<TContext>;
+            367?: ErrorCallback<TContext>;
+            368?: ErrorCallback<TContext>;
+            369?: ErrorCallback<TContext>;
+            370?: ErrorCallback<TContext>;
+            371?: ErrorCallback<TContext>;
+            372?: ErrorCallback<TContext>;
+            373?: ErrorCallback<TContext>;
+            374?: ErrorCallback<TContext>;
+            375?: ErrorCallback<TContext>;
+            376?: ErrorCallback<TContext>;
+            377?: ErrorCallback<TContext>;
+            378?: ErrorCallback<TContext>;
+            379?: ErrorCallback<TContext>;
+            380?: ErrorCallback<TContext>;
+            381?: ErrorCallback<TContext>;
+            382?: ErrorCallback<TContext>;
+            383?: ErrorCallback<TContext>;
+            384?: ErrorCallback<TContext>;
+            385?: ErrorCallback<TContext>;
+            386?: ErrorCallback<TContext>;
+            387?: ErrorCallback<TContext>;
+            388?: ErrorCallback<TContext>;
+            389?: ErrorCallback<TContext>;
+            390?: ErrorCallback<TContext>;
+            391?: ErrorCallback<TContext>;
+            392?: ErrorCallback<TContext>;
+            393?: ErrorCallback<TContext>;
+            394?: ErrorCallback<TContext>;
+            395?: ErrorCallback<TContext>;
+            396?: ErrorCallback<TContext>;
+            397?: ErrorCallback<TContext>;
+            398?: ErrorCallback<TContext>;
+            399?: ErrorCallback<TContext>;
             400?: ErrorCallback<TContext>;
             401?: ErrorCallback<TContext>;
             402?: ErrorCallback<TContext>;
@@ -3727,15 +3824,87 @@ declare namespace JQuery {
             416?: ErrorCallback<TContext>;
             417?: ErrorCallback<TContext>;
             418?: ErrorCallback<TContext>;
+            419?: ErrorCallback<TContext>;
+            420?: ErrorCallback<TContext>;
             421?: ErrorCallback<TContext>;
             422?: ErrorCallback<TContext>;
             423?: ErrorCallback<TContext>;
             424?: ErrorCallback<TContext>;
+            425?: ErrorCallback<TContext>;
             426?: ErrorCallback<TContext>;
+            427?: ErrorCallback<TContext>;
             428?: ErrorCallback<TContext>;
             429?: ErrorCallback<TContext>;
+            430?: ErrorCallback<TContext>;
             431?: ErrorCallback<TContext>;
+            432?: ErrorCallback<TContext>;
+            433?: ErrorCallback<TContext>;
+            434?: ErrorCallback<TContext>;
+            435?: ErrorCallback<TContext>;
+            436?: ErrorCallback<TContext>;
+            437?: ErrorCallback<TContext>;
+            438?: ErrorCallback<TContext>;
+            439?: ErrorCallback<TContext>;
+            440?: ErrorCallback<TContext>;
+            441?: ErrorCallback<TContext>;
+            442?: ErrorCallback<TContext>;
+            443?: ErrorCallback<TContext>;
+            444?: ErrorCallback<TContext>;
+            445?: ErrorCallback<TContext>;
+            446?: ErrorCallback<TContext>;
+            447?: ErrorCallback<TContext>;
+            448?: ErrorCallback<TContext>;
+            449?: ErrorCallback<TContext>;
+            450?: ErrorCallback<TContext>;
             451?: ErrorCallback<TContext>;
+            452?: ErrorCallback<TContext>;
+            453?: ErrorCallback<TContext>;
+            454?: ErrorCallback<TContext>;
+            455?: ErrorCallback<TContext>;
+            456?: ErrorCallback<TContext>;
+            457?: ErrorCallback<TContext>;
+            458?: ErrorCallback<TContext>;
+            459?: ErrorCallback<TContext>;
+            460?: ErrorCallback<TContext>;
+            461?: ErrorCallback<TContext>;
+            462?: ErrorCallback<TContext>;
+            463?: ErrorCallback<TContext>;
+            464?: ErrorCallback<TContext>;
+            465?: ErrorCallback<TContext>;
+            466?: ErrorCallback<TContext>;
+            467?: ErrorCallback<TContext>;
+            468?: ErrorCallback<TContext>;
+            469?: ErrorCallback<TContext>;
+            470?: ErrorCallback<TContext>;
+            471?: ErrorCallback<TContext>;
+            472?: ErrorCallback<TContext>;
+            473?: ErrorCallback<TContext>;
+            474?: ErrorCallback<TContext>;
+            475?: ErrorCallback<TContext>;
+            476?: ErrorCallback<TContext>;
+            477?: ErrorCallback<TContext>;
+            478?: ErrorCallback<TContext>;
+            479?: ErrorCallback<TContext>;
+            480?: ErrorCallback<TContext>;
+            481?: ErrorCallback<TContext>;
+            482?: ErrorCallback<TContext>;
+            483?: ErrorCallback<TContext>;
+            484?: ErrorCallback<TContext>;
+            485?: ErrorCallback<TContext>;
+            486?: ErrorCallback<TContext>;
+            487?: ErrorCallback<TContext>;
+            488?: ErrorCallback<TContext>;
+            489?: ErrorCallback<TContext>;
+            490?: ErrorCallback<TContext>;
+            491?: ErrorCallback<TContext>;
+            492?: ErrorCallback<TContext>;
+            493?: ErrorCallback<TContext>;
+            494?: ErrorCallback<TContext>;
+            495?: ErrorCallback<TContext>;
+            496?: ErrorCallback<TContext>;
+            497?: ErrorCallback<TContext>;
+            498?: ErrorCallback<TContext>;
+            499?: ErrorCallback<TContext>;
             500?: ErrorCallback<TContext>;
             501?: ErrorCallback<TContext>;
             502?: ErrorCallback<TContext>;
@@ -3745,9 +3914,106 @@ declare namespace JQuery {
             506?: ErrorCallback<TContext>;
             507?: ErrorCallback<TContext>;
             508?: ErrorCallback<TContext>;
+            509?: ErrorCallback<TContext>;
             510?: ErrorCallback<TContext>;
             511?: ErrorCallback<TContext>;
-        } & { [index: number]: SuccessCallback<TContext> | ErrorCallback<TContext>; };
+            512?: ErrorCallback<TContext>;
+            513?: ErrorCallback<TContext>;
+            514?: ErrorCallback<TContext>;
+            515?: ErrorCallback<TContext>;
+            516?: ErrorCallback<TContext>;
+            517?: ErrorCallback<TContext>;
+            518?: ErrorCallback<TContext>;
+            519?: ErrorCallback<TContext>;
+            520?: ErrorCallback<TContext>;
+            521?: ErrorCallback<TContext>;
+            522?: ErrorCallback<TContext>;
+            523?: ErrorCallback<TContext>;
+            524?: ErrorCallback<TContext>;
+            525?: ErrorCallback<TContext>;
+            526?: ErrorCallback<TContext>;
+            527?: ErrorCallback<TContext>;
+            528?: ErrorCallback<TContext>;
+            529?: ErrorCallback<TContext>;
+            530?: ErrorCallback<TContext>;
+            531?: ErrorCallback<TContext>;
+            532?: ErrorCallback<TContext>;
+            533?: ErrorCallback<TContext>;
+            534?: ErrorCallback<TContext>;
+            535?: ErrorCallback<TContext>;
+            536?: ErrorCallback<TContext>;
+            537?: ErrorCallback<TContext>;
+            538?: ErrorCallback<TContext>;
+            539?: ErrorCallback<TContext>;
+            540?: ErrorCallback<TContext>;
+            541?: ErrorCallback<TContext>;
+            542?: ErrorCallback<TContext>;
+            543?: ErrorCallback<TContext>;
+            544?: ErrorCallback<TContext>;
+            545?: ErrorCallback<TContext>;
+            546?: ErrorCallback<TContext>;
+            547?: ErrorCallback<TContext>;
+            548?: ErrorCallback<TContext>;
+            549?: ErrorCallback<TContext>;
+            550?: ErrorCallback<TContext>;
+            551?: ErrorCallback<TContext>;
+            552?: ErrorCallback<TContext>;
+            553?: ErrorCallback<TContext>;
+            554?: ErrorCallback<TContext>;
+            555?: ErrorCallback<TContext>;
+            556?: ErrorCallback<TContext>;
+            557?: ErrorCallback<TContext>;
+            558?: ErrorCallback<TContext>;
+            559?: ErrorCallback<TContext>;
+            560?: ErrorCallback<TContext>;
+            561?: ErrorCallback<TContext>;
+            562?: ErrorCallback<TContext>;
+            563?: ErrorCallback<TContext>;
+            564?: ErrorCallback<TContext>;
+            565?: ErrorCallback<TContext>;
+            566?: ErrorCallback<TContext>;
+            567?: ErrorCallback<TContext>;
+            568?: ErrorCallback<TContext>;
+            569?: ErrorCallback<TContext>;
+            570?: ErrorCallback<TContext>;
+            571?: ErrorCallback<TContext>;
+            572?: ErrorCallback<TContext>;
+            573?: ErrorCallback<TContext>;
+            574?: ErrorCallback<TContext>;
+            575?: ErrorCallback<TContext>;
+            576?: ErrorCallback<TContext>;
+            577?: ErrorCallback<TContext>;
+            578?: ErrorCallback<TContext>;
+            579?: ErrorCallback<TContext>;
+            580?: ErrorCallback<TContext>;
+            581?: ErrorCallback<TContext>;
+            582?: ErrorCallback<TContext>;
+            583?: ErrorCallback<TContext>;
+            584?: ErrorCallback<TContext>;
+            585?: ErrorCallback<TContext>;
+            586?: ErrorCallback<TContext>;
+            587?: ErrorCallback<TContext>;
+            588?: ErrorCallback<TContext>;
+            589?: ErrorCallback<TContext>;
+            590?: ErrorCallback<TContext>;
+            591?: ErrorCallback<TContext>;
+            592?: ErrorCallback<TContext>;
+            593?: ErrorCallback<TContext>;
+            594?: ErrorCallback<TContext>;
+            595?: ErrorCallback<TContext>;
+            596?: ErrorCallback<TContext>;
+            597?: ErrorCallback<TContext>;
+            598?: ErrorCallback<TContext>;
+            599?: ErrorCallback<TContext>;
+
+            // endregion
+        } & {
+            // Status codes not listed require type annotations when defining the callback
+            [index: number]: SuccessCallback<TContext> | ErrorCallback<TContext>;
+        };
+
+        // Writable properties on XMLHttpRequest
+        interface XHRFields extends Partial<Pick<XMLHttpRequest, 'onreadystatechange' | 'responseType' | 'timeout' | 'withCredentials' | 'msCaching'>> { }
     }
 
     interface Transport {

From e9a5643e4d784cf6855fd9c3237a435abc8bb0fc Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Sat, 24 Jun 2017 10:12:46 -0400
Subject: [PATCH 018/287] lodash: _.compact should remove more types (#17416)

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

diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index 910e29bd95..f5f94bf899 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Lo-Dash 4.14
 // Project: http://lodash.com/
-// Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>, Eric L Anderson <https://github.com/ericanderson>
+// Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>, Eric L Anderson <https://github.com/ericanderson>, AJ Richardson <https://github.com/aj-r>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -485,7 +485,7 @@ declare namespace _ {
          * @param array The array to compact.
          * @return (Array) Returns the new array of filtered values.
          */
-        compact<T>(array?: List<T | null | undefined> | null | undefined): T[];
+        compact<T>(array?: List<T | null | undefined | false | "" | 0> | null | undefined): T[];
     }
 
     interface LoDashImplicitArrayWrapperBase<T, TArray extends T[] | null | undefined, TWrapper> {
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index a11485ca07..83f9476395 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -207,6 +207,8 @@ namespace TestChunk {
 namespace TestCompact {
     let array: TResult[] | null | undefined = [] as any;
     let list: _.List<TResult> | null | undefined = [] as any;
+    let array2: Array<TResult | null | undefined | false | "" | 0> | null | undefined = any;
+    let list2: _.List<TResult | null | undefined | false | "" | 0> | null | undefined = any;
 
     {
         let result: TResult[];
@@ -214,6 +216,8 @@ namespace TestCompact {
         result = _.compact<TResult>();
         result = _.compact<TResult>(array);
         result = _.compact<TResult>(list);
+        result = _.compact(array2);
+        result = _.compact(list2);
     }
 
     {

From f17d785e96781b9d5126fdbdfaa547b2510d0790 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Jun 2017 11:32:48 -0400
Subject: [PATCH 019/287] [jquery] Fix jqXHR, Deferred, and Promise.

---
 types/jquery/index.d.ts      | 154 ++++++++++----------
 types/jquery/jquery-tests.ts | 264 +++++++++++++++++++++++++++++++++--
 2 files changed, 328 insertions(+), 90 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index eb41fd1845..45baaba789 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4030,10 +4030,10 @@ declare namespace JQuery {
     /**
      * @see {@link http://api.jquery.com/jquery.ajax/#jqXHR}
      */
-    interface jqXHR<TResolve = any> extends Pick<XMLHttpRequest, 'readyState' | 'responseXML' | 'responseText' | 'status' |
-        'statusText' | 'abort' | 'getAllResponseHeaders' | 'getResponseHeader' | 'overrideMimeType' | 'setRequestHeader'> {
-        responseJSON: any;
-        statusCode(map: Ajax.StatusCodeCallbacks<any>): void;
+    interface jqXHR<TResolve = any> extends Pick<XMLHttpRequest, 'abort' | 'getAllResponseHeaders' | 'getResponseHeader' | 'overrideMimeType' | 'readyState' | 'responseText' |
+        'setRequestHeader' | 'status' | 'statusText'>,
+        Partial<Pick<XMLHttpRequest, 'responseXML'>> {
+        responseJSON?: any;
 
         /**
          * Add handlers to be called when the Deferred object is either resolved or rejected.
@@ -4093,6 +4093,8 @@ declare namespace JQuery {
          */
         pipe<UResolve, UReject>(doneFilter: ((data: TResolve, textStatus: Ajax.SuccessTextStatus, jqXHR: this) => UResolve | Thenable<UResolve>) | null,
                                 failFilter?: ((jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => UReject | Thenable<UReject>) | null): Deferred<UResolve | UReject>;
+        // jQuery doesn't send progress notifications so progress callbacks will never be called.
+        // Leaving progress() in however allows for structural compatibility with JQuery.Promise.
         /**
          * Add handlers to be called when the Deferred object generates progress notifications.
          *
@@ -4102,8 +4104,8 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.progress/}
          * @since 1.7
          */
-        progress(progressCallback: TypeOrArray<jqXHR.ProgressCallback>,
-                 ...progressCallbacks: Array<TypeOrArray<jqXHR.ProgressCallback>>): this;
+        progress(progressCallback: TypeOrArray<Function>,
+                 ...progressCallbacks: Array<TypeOrArray<Function>>): this;
         /**
          * Return a Deferred's Promise object.
          *
@@ -4126,6 +4128,7 @@ declare namespace JQuery {
          * @since 1.7
          */
         state(): 'pending' | 'resolved' | 'rejected';
+        statusCode(map: Ajax.StatusCodeCallbacks<any>): void;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4151,10 +4154,6 @@ declare namespace JQuery {
         interface AlwaysCallback<TResolve = any> {
             (data_jqXHR: TResolve | jqXHR<TResolve>, textStatus: Ajax.TextStatus, jqXHR_errorThrown: jqXHR<TResolve> | string): void;
         }
-
-        interface ProgressCallback {
-            (...values: any[]): void;
-        }
     }
 
     // endregion
@@ -4266,17 +4265,7 @@ declare namespace JQuery {
      */
     interface Thenable<T> extends PromiseLike<T> { }
 
-    interface Deferred<TResolve, TReject = any, TNotify = any> {
-        /**
-         * Add handlers to be called when the Deferred object is either resolved or rejected.
-         *
-         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
-         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-         * @see {@link https://api.jquery.com/deferred.always/}
-         * @since 1.6
-         */
-        always(alwaysCallback: TypeOrArray<Deferred.AlwaysCallback<TResolve, TReject>>,
-               ...alwaysCallbacks: Array<TypeOrArray<Deferred.AlwaysCallback<TResolve, TReject>>>): this;
+    interface Deferred<TResolve, TReject = any, TNotify = any> extends Deferred.PromiseBase<TResolve, TReject, TNotify> {
         /**
          * Add handlers to be called when the Deferred object is rejected.
          *
@@ -4285,26 +4274,6 @@ declare namespace JQuery {
          * @since 3.0
          */
         catch<UResolve>(failFilter: (...reasons: TReject[]) => UResolve | Thenable<UResolve>): Deferred<UResolve, TReject, TNotify>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved.
-         *
-         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
-         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.done/}
-         * @since 1.5
-         */
-        done(doneCallback: TypeOrArray<Deferred.DoneCallback<TResolve>>,
-             ...doneCallbacks: Array<TypeOrArray<Deferred.DoneCallback<TResolve>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object is rejected.
-         *
-         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
-         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.fail/}
-         * @since 1.5
-         */
-        fail(failCallback: TypeOrArray<Deferred.FailCallback<TReject>>,
-             ...failCallbacks: Array<TypeOrArray<Deferred.FailCallback<TReject>>>): this;
         /**
          * Call the progressCallbacks on a Deferred object with the given args.
          *
@@ -4338,32 +4307,6 @@ declare namespace JQuery {
             UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
                                failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
                                progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
-        /**
-         * Add handlers to be called when the Deferred object generates progress notifications.
-         *
-         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
-         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
-         *                          progress notifications.
-         * @see {@link https://api.jquery.com/deferred.progress/}
-         * @since 1.7
-         */
-        progress(progressCallback: TypeOrArray<Deferred.ProgressCallback<TNotify>>,
-                 ...progressCallbacks: Array<TypeOrArray<Deferred.ProgressCallback<TNotify>>>): this;
-        /**
-         * Return a Deferred's Promise object.
-         *
-         * @param target Object onto which the promise methods have to be attached
-         * @see {@link https://api.jquery.com/deferred.promise/}
-         * @since 1.5
-         */
-        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TResolve> & TTarget;
-        /**
-         * Return a Deferred's Promise object.
-         *
-         * @see {@link https://api.jquery.com/deferred.promise/}
-         * @since 1.5
-         */
-        promise(): JQuery.Promise<TResolve>;
         /**
          * Reject a Deferred object and call any failCallbacks with the given args.
          *
@@ -4398,13 +4341,6 @@ declare namespace JQuery {
          * @since 1.5
          */
         resolveWith(context: object, ...args: TResolve[]): this;
-        /**
-         * Determine the current state of a Deferred object.
-         *
-         * @see {@link https://api.jquery.com/deferred.state/}
-         * @since 1.7
-         */
-        state(): 'pending' | 'resolved' | 'rejected';
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4437,6 +4373,73 @@ declare namespace JQuery {
         interface ProgressCallback<TNotify> {
             (...values: TNotify[]): void;
         }
+
+        // Common interface for Deferred and Promise
+        interface PromiseBase<TResolve, TReject, TNotify> {
+            /**
+             * Add handlers to be called when the Deferred object is either resolved or rejected.
+             *
+             * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
+             * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+             * @see {@link https://api.jquery.com/deferred.always/}
+             * @since 1.6
+             */
+            always(alwaysCallback: TypeOrArray<Deferred.AlwaysCallback<TResolve, TReject>>,
+                   ...alwaysCallbacks: Array<TypeOrArray<Deferred.AlwaysCallback<TResolve, TReject>>>): this;
+            /**
+             * Add handlers to be called when the Deferred object is resolved.
+             *
+             * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
+             * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+             * @see {@link https://api.jquery.com/deferred.done/}
+             * @since 1.5
+             */
+            done(doneCallback: TypeOrArray<Deferred.DoneCallback<TResolve>>,
+                 ...doneCallbacks: Array<TypeOrArray<Deferred.DoneCallback<TResolve>>>): this;
+            /**
+             * Add handlers to be called when the Deferred object is rejected.
+             *
+             * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
+             * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+             * @see {@link https://api.jquery.com/deferred.fail/}
+             * @since 1.5
+             */
+            fail(failCallback: TypeOrArray<Deferred.FailCallback<TReject>>,
+                 ...failCallbacks: Array<TypeOrArray<Deferred.FailCallback<TReject>>>): this;
+            /**
+             * Add handlers to be called when the Deferred object generates progress notifications.
+             *
+             * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
+             * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
+             *                          progress notifications.
+             * @see {@link https://api.jquery.com/deferred.progress/}
+             * @since 1.7
+             */
+            progress(progressCallback: TypeOrArray<Deferred.ProgressCallback<TNotify>>,
+                     ...progressCallbacks: Array<TypeOrArray<Deferred.ProgressCallback<TNotify>>>): this;
+            /**
+             * Return a Deferred's Promise object.
+             *
+             * @param target Object onto which the promise methods have to be attached
+             * @see {@link https://api.jquery.com/deferred.promise/}
+             * @since 1.5
+             */
+            promise<TTarget extends object>(target: TTarget): JQuery.Promise<TResolve> & TTarget;
+            /**
+             * Return a Deferred's Promise object.
+             *
+             * @see {@link https://api.jquery.com/deferred.promise/}
+             * @since 1.5
+             */
+            promise(): JQuery.Promise<TResolve>;
+            /**
+             * Determine the current state of a Deferred object.
+             *
+             * @see {@link https://api.jquery.com/deferred.state/}
+             * @since 1.7
+             */
+            state(): 'pending' | 'resolved' | 'rejected';
+        }
     }
 
     /**
@@ -4445,8 +4448,7 @@ declare namespace JQuery {
      *
      * @see {@link http://api.jquery.com/Types/#Promise}
      */
-    interface Promise<TResolve, TReject = any, TNotify = any> extends Pick<Deferred<TResolve, TReject, TNotify>,
-        'always' | 'done' | 'fail' | 'progress' | 'promise' | 'state'> {
+    interface Promise<TResolve, TReject = any, TNotify = any> extends Deferred.PromiseBase<TResolve, TReject, TNotify> {
         /**
          * Add handlers to be called when the Deferred object is rejected.
          *
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 88cf87c95c..64b171bdfd 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4684,7 +4684,7 @@ function EffectsOptions() {
     });
 }
 
-function JQuery_Event() {
+function _Event() {
     function mixin() {
         const e = $.Event('keydown', {
             mySpecialKeyCode: JQuery.Key.CapsLock,
@@ -4695,9 +4695,256 @@ function JQuery_Event() {
 }
 
 function jqXHR() {
-    function catch_returnType() {
+    function always() {
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').always((data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        }, [(data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        }], (data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').always((data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        }, [(data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        }]);
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').always([(data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        }], (data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').always((data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').always([(data_jqXHR, textStatus, jqXHR_errorThrown) => {
+            // $ExpectType any
+            data_jqXHR;
+            // $ExpectType TextStatus
+            textStatus;
+            // $ExpectType string | jqXHR<any>
+            jqXHR_errorThrown;
+        }]);
+    }
+
+    function done() {
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').done((data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        }, [(data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        }], (data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').done((data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        }, [(data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        }]);
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').done([(data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        }], (data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').done((data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').done([(data, textStatus, jqXHR) => {
+            // $ExpectType any
+            data;
+            // $ExpectType SuccessTextStatus
+            textStatus;
+            // $ExpectType jqXHR<any>
+            jqXHR;
+        }]);
+    }
+
+    function fail() {
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').fail((jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        }, [(jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        }], (jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').fail((jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        }, [(jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        }]);
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').fail([(jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        }], (jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').fail((jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        });
+
+        // $ExpectType jqXHR<any>
+        $.ajax('/echo/json').fail([(jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        }]);
+    }
+
+    function _catch() {
         // $ExpectType Deferred<void, never, any>
-        $.ajax('/echo').catch(() => { });
+        $.ajax('/echo').catch((jqXHR, textStatus, errorThrown) => {
+            // $ExpectType jqXHR<any>
+            jqXHR;
+            // $ExpectType ErrorTextStatus
+            textStatus;
+            // $ExpectType string
+            errorThrown;
+        });
     }
 
     function catch_throw_returnType() {
@@ -4726,15 +4973,4 @@ function jqXHR() {
             value;
         });
     }
-
-    function fail() {
-        $.ajax('/echo').fail((jqXHR, textStatus, errorThrown) => {
-            // $ExpectType jqXHR<any>
-            jqXHR;
-            // $ExpectType ErrorTextStatus
-            textStatus;
-            // $ExpectType string
-            errorThrown;
-        });
-    }
 }

From 20fbc1f61b43be08d8f22920d813725dbc709459 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Jun 2017 11:35:18 -0400
Subject: [PATCH 020/287] [jquery] Improve Callbacks. Make Callbacks generic.
 Fix some method signatures.

---
 types/jquery/index.d.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 45baaba789..3d65135f5f 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -2499,7 +2499,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.Callbacks/}
      * @since 1.7
      */
-    Callbacks(flags?: string): JQuery.Callbacks;
+    Callbacks<T extends Function>(flags?: string): JQuery.Callbacks<T>;
     /**
      * A factory function that returns a chainable utility object with methods to register multiple
      * callbacks into callback queues, invoke callback queues, and relay the success or failure state of
@@ -4160,15 +4160,16 @@ declare namespace JQuery {
 
     // region Callbacks
 
-    interface Callbacks {
+    interface Callbacks<T extends Function = Function> {
         /**
          * Add a callback or a collection of callbacks to a callback list.
          *
+         * @param callback A function, or array of functions, that are to be added to the callback list.
          * @param callbacks A function, or array of functions, that are to be added to the callback list.
          * @see {@link https://api.jquery.com/callbacks.add/}
          * @since 1.7
          */
-        add(callbacks: TypeOrArray<Function>): this;
+        add(callback: TypeOrArray<T>, ...callbacks: Array<TypeOrArray<T>>): this;
         /**
          * Disable a callback list from doing anything more.
          *
@@ -4206,7 +4207,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/callbacks.fireWith/}
          * @since 1.7
          */
-        fireWith(context?: object, args?: TypeOrArray<any>): this;
+        fireWith(context: object, args?: ArrayLike<any>): this;
         /**
          * Determine if the callbacks have already been called at least once.
          *
@@ -4222,7 +4223,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/callbacks.has/}
          * @since 1.7
          */
-        has(callback?: Function): boolean;
+        has(callback?: T): boolean;
         /**
          * Lock a callback list in its current state.
          *
@@ -4244,7 +4245,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/callbacks.remove/}
          * @since 1.7
          */
-        remove(callbacks: TypeOrArray<Function>): this;
+        remove(...callbacks: T[]): this;
     }
 
     // endregion
@@ -4901,7 +4902,7 @@ declare namespace JQuery {
 
 // region Legacy types
 
-interface JQueryCallback extends JQuery.Callbacks { }
+interface JQueryCallback extends JQuery.Callbacks<Function> { }
 interface JQueryDeferred<T> extends JQuery.Deferred<T> { }
 interface JQueryEventObject extends JQuery.Event<HTMLElement> { }
 interface JQueryEventConstructor extends JQuery.Event<EventTarget> { }

From 9c7cc11356d9ecb755e3f16b469d90806acb0461 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Jun 2017 12:10:50 -0400
Subject: [PATCH 021/287] [jquery] Add tests for Callbacks.

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

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 64b171bdfd..1fda6e2da8 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4620,6 +4620,86 @@ function AjaxSettings() {
     });
 }
 
+function Callbacks() {
+    function add() {
+        const callbacks = $.Callbacks();
+
+        // $ExpectType Callbacks<Function>
+        callbacks.add(() => { }, [() => { }], () => { });
+
+        // $ExpectType Callbacks<Function>
+        callbacks.add(() => { }, [() => { }]);
+
+        // $ExpectType Callbacks<Function>
+        callbacks.add(() => { }, () => { });
+
+        // $ExpectType Callbacks<Function>
+        callbacks.add(() => { });
+
+        // $ExpectType Callbacks<Function>
+        callbacks.add([() => { }]);
+    }
+
+    function disable() {
+        // $ExpectType Callbacks<Function>
+        $.Callbacks().disable();
+    }
+
+    function disabled() {
+        // $ExpectType boolean
+        $.Callbacks().disabled();
+    }
+
+    function empty() {
+        // $ExpectType Callbacks<Function>
+        $.Callbacks().empty();
+    }
+
+    function fire() {
+        // $ExpectType Callbacks<Function>
+        $.Callbacks().fire(1);
+
+        // $ExpectType Callbacks<Function>
+        $.Callbacks().fire();
+    }
+
+    function fireWith() {
+        // $ExpectType Callbacks<Function>
+        $.Callbacks().fireWith(window, [1]);
+
+        // $ExpectType Callbacks<Function>
+        $.Callbacks().fireWith(window);
+    }
+
+    function fired() {
+        // $ExpectType boolean
+        $.Callbacks().fired();
+    }
+
+    function has() {
+        // $ExpectType boolean
+        $.Callbacks().has(() => { });
+
+        // $ExpectType boolean
+        $.Callbacks().has();
+    }
+
+    function lock() {
+        // $ExpectType Callbacks<Function>
+        $.Callbacks().lock();
+    }
+
+    function locked() {
+        // $ExpectType boolean
+        $.Callbacks().locked();
+    }
+
+    function remove() {
+        // $ExpectType Callbacks<Function>
+        $.Callbacks().remove(() => { }, () => { });
+    }
+}
+
 function EffectsOptions() {
     $('p').show({
         always(animation, jumpToEnd) {

From 6520173bf00e1f156c027a8cdbbcddba7405c019 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Jun 2017 12:22:40 -0400
Subject: [PATCH 022/287] [jquery] Fix Deferred method signatures.

---
 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 3d65135f5f..93bb3cb027 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4291,7 +4291,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.notifyWith/}
          * @since 1.7
          */
-        notifyWith(context: object, ...args: TNotify[]): this;
+        notifyWith(context: object, args?: ArrayLike<TNotify>): this;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4324,7 +4324,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.rejectWith/}
          * @since 1.5
          */
-        rejectWith(context: object, ...args: TReject[]): this;
+        rejectWith(context: object, args?: ArrayLike<TReject>): this;
         /**
          * Resolve a Deferred object and call any doneCallbacks with the given args.
          *
@@ -4341,7 +4341,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.resolveWith/}
          * @since 1.5
          */
-        resolveWith(context: object, ...args: TResolve[]): this;
+        resolveWith(context: object, args?: ArrayLike<TResolve>): this;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *

From fd26b7b0a2bdd2d450b8aecceed60fc78a3c3741 Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <d3ivi2kas@windowslive.com>
Date: Sat, 24 Jun 2017 19:31:47 +0300
Subject: [PATCH 023/287] SwipeViewsProps updated.

---
 types/react-swipeable-views/index.d.ts | 66 ++++++++++++++++----------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/types/react-swipeable-views/index.d.ts b/types/react-swipeable-views/index.d.ts
index b146983efa..fd4b322fd5 100644
--- a/types/react-swipeable-views/index.d.ts
+++ b/types/react-swipeable-views/index.d.ts
@@ -7,34 +7,50 @@
 
 import * as React from 'react';
 
-export as namespace ReactSwipeableViews;
+export type OnChangeIndexCallback = (index: number, indexLatest: number) => void;
 
-export type OnChangeIndexCallback = (indexNew: number, indexLatest: number) => void;
-export type OnSwitchingCallback = (index: number) => void;
+export type OnTransitionEndCallback = () => void;
 
-declare namespace ReactSwipeableViews {
-    interface SwipeableViewsProps extends React.Props<SwipeableViews> {
-        containerStyle?: React.CSSProperties;
-        disabled?: boolean;
-        index?: number;
-        onChangeIndex?: OnChangeIndexCallback;
-        onSwitching?: OnSwitchingCallback;
-        resistance?: boolean;
-        slideStyle?: React.CSSProperties;
-        style?: React.CSSProperties;
-        threshold?: number;
-    }
+export type OnSwitchingCallback = (index: number, type: OnSwitchingCallbackTypeDescriptor) => void;
 
-    interface SwipeableViewsState {
-        indexCurrent?: number;
-        indexLatest?: number;
-        isDragging?: boolean;
-        isFirstRender?: boolean;
-        heightLatest?: number;
-    }
+export type OnSwitchingCallbackTypeDescriptor = "move" | "end";
 
-    class SwipeableViews extends React.Component<SwipeableViewsProps, SwipeableViewsState> {
-    }
+export type AxisType = "x" | "x-reverse" | "y" | "y-reverse";
+
+export interface SpringConfig {
+    duration: string;
+    easeFunction: string;
+    delay: string;
 }
 
-export default ReactSwipeableViews.SwipeableViews;
+export interface SwipeableViewsProps extends React.HTMLProps<HTMLDivElement> {
+    animateHeight?: boolean;
+    animateTransitions?: boolean;
+    axis?: AxisType;
+    containerStyle?: React.CSSProperties;
+    disabled?: boolean;
+    enableMouseEvents?: boolean;
+    hysteresis?: number;
+    ignoreNativeScroll?: boolean;
+    index?: number;
+    onChangeIndex?: OnChangeIndexCallback;
+    onSwitching?: OnSwitchingCallback;
+    onTransitionEnd?: OnTransitionEndCallback;
+    resistance?: boolean;
+    style?: React.CSSProperties;
+    slideStyle?: React.CSSProperties;
+    springConfig?: SpringConfig;
+    slideClassName?: string;
+    threshold?: number;
+}
+
+export interface SwipeableViewsState {
+    indexCurrent?: number;
+    indexLatest?: number;
+    isDragging?: boolean;
+    isFirstRender?: boolean;
+    heightLatest?: number;
+    displaySameSlide?: boolean;
+}
+
+export default class SwipeableViews extends React.Component<SwipeableViewsProps, SwipeableViewsState> { }

From 0f4752e56fcb5a75d84cd45d0eca0ec56e5ac42d Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <d3ivi2kas@windowslive.com>
Date: Sat, 24 Jun 2017 19:45:23 +0300
Subject: [PATCH 024/287] react-swipeable-views-tests.ts updated.

---
 .../react-swipeable-views-tests.ts            | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/types/react-swipeable-views/react-swipeable-views-tests.ts b/types/react-swipeable-views/react-swipeable-views-tests.ts
index bb31b7e2fe..b723f58575 100644
--- a/types/react-swipeable-views/react-swipeable-views-tests.ts
+++ b/types/react-swipeable-views/react-swipeable-views-tests.ts
@@ -1,18 +1,35 @@
 import * as React from 'react';
-import SwipeableViews from 'react-swipeable-views';
+import SwipeableViews,
+{
+    OnChangeIndexCallback,
+    OnSwitchingCallback,
+    OnSwitchingCallbackTypeDescriptor,
+    OnTransitionEndCallback,
+    SpringConfig
+} from 'react-swipeable-views';
 
-const onChangeIndex = (indexNew: number, indexLatest: number) => {
+const onChangeIndex: OnChangeIndexCallback = (indexNew: number, indexLatest: number) => {
     console.log('New index: ' + indexNew + ', latest index' + indexLatest);
 };
 
-const onSwitching = (index: number) => {
-    console.log('Switching to ' + index);
+const onSwitching: OnSwitchingCallback = (index: number, type: OnSwitchingCallbackTypeDescriptor) => {
+    console.log(`Switching to ${index} with transition type "${type}"`);
+};
+
+const onTransitionEnd: OnTransitionEndCallback = () => {
+    console.log("Transition end.");
 };
 
 const style: React.CSSProperties = {
     height: 300
 };
 
+const springConfig: SpringConfig = {
+    duration: "0.5s",
+    easeFunction: "cubic-bezier(0.1, 0.35, 0.2, 1)",
+    delay: "0.5s",
+};
+
 React.createElement(SwipeableViews, {
     containerStyle: style,
     disabled: false,
@@ -22,7 +39,12 @@ React.createElement(SwipeableViews, {
     resistance: false,
     slideStyle: style,
     style,
-    threshold: 100
+    threshold: 100,
+    className: "swipable-view",
+    title: "Carousel",
+    onTransitionEnd,
+    axis: "x-reverse",
+    springConfig
 });
 
 React.createElement(SwipeableViews, {});

From 869c4ba5605d0dcdbe7804edae160dd2f984f1e3 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sat, 24 Jun 2017 12:57:14 -0400
Subject: [PATCH 025/287] [jquery] Refactor Event. Static members moved to a
 separate type. Removed originalTarget property.

---
 types/jquery/index.d.ts      | 101 ++++++++++++++++++++---------------
 types/jquery/jquery-tests.ts |  22 ++++++--
 2 files changed, 75 insertions(+), 48 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 93bb3cb027..7a1443e9ad 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -2394,7 +2394,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
 interface JQuery<TElement extends Node = HTMLElement> extends ArrayLike<TElement>, Iterable<TElement> { }
 
 interface JQueryStatic<TElement extends Node = HTMLElement> {
-    Event: JQuery.Event<TElement>;
+    Event: JQuery.EventStatic<TElement>;
     /**
      * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize
      * CSS property naming, or create custom properties.
@@ -4597,29 +4597,12 @@ declare namespace JQuery {
 
     // region Events
 
+    // region Event
+
     // This should be a class but doesn't work correctly under the JQuery namespace. Event should be an inner class of jQuery.
-    interface Event<TTarget = EventTarget, TData = null> {
-        /**
-         * The current DOM element within the event bubbling phase.
-         *
-         * @see {@link https://api.jquery.com/event.currentTarget/}
-         * @since 1.3
-         */
-        currentTarget: TTarget;
-        /**
-         * An optional object of data passed to an event method when the current executing handler is bound.
-         *
-         * @see {@link https://api.jquery.com/event.data/}
-         * @since 1.1
-         */
-        data: TData;
-        /**
-         * The element where the currently-called jQuery event handler was attached.
-         *
-         * @see {@link https://api.jquery.com/event.delegateTarget/}
-         * @since 1.7
-         */
-        delegateTarget: TTarget;
+
+    // Instance members
+    interface Event {
         /**
          * Indicates whether the META key was pressed when the event fired.
          *
@@ -4648,13 +4631,6 @@ declare namespace JQuery {
          * @since 1.0.4
          */
         pageY: number;
-        /**
-         * The other DOM element involved in the event, if any.
-         *
-         * @see {@link https://api.jquery.com/event.relatedTarget/}
-         * @since 1.1.4
-         */
-        relatedTarget: TTarget | null;
         /**
          * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
          *
@@ -4662,13 +4638,6 @@ declare namespace JQuery {
          * @since 1.3
          */
         result: any;
-        /**
-         * The DOM element that initiated the event.
-         *
-         * @see {@link https://api.jquery.com/event.target/}
-         * @since 1.0
-         */
-        target: TTarget;
         /**
          * The difference in milliseconds between the time the browser created the event and January 1, 1970.
          *
@@ -4740,18 +4709,64 @@ declare namespace JQuery {
         stopPropagation(): void;
     }
 
-    interface Event<TTarget = EventTarget> extends Partial<Pick<PointerEvent & KeyboardEvent & TouchEvent, 'altKey' | 'bubbles' | 'cancelable' |
+    // Generic members
+    interface Event<TTarget = EventTarget,
+        TData = null> extends Partial<Pick<PointerEvent & KeyboardEvent & TouchEvent, 'altKey' | 'bubbles' | 'cancelable' |
         'changedTouches' | 'ctrlKey' | 'detail' | 'eventPhase' | 'metaKey' | 'pageX' | 'pageY' | 'shiftKey' | 'view' |
         'char' | 'charCode' | 'key' | 'keyCode' | 'button' | 'buttons' | 'clientX' | 'clientY' | 'offsetX' | 'offsetY' |
         'pointerId' | 'pointerType' | 'screenX' | 'screenY' | 'targetTouches' | 'toElement' | 'touches'>> {
-        originalTarget?: TTarget;
+        /**
+         * The current DOM element within the event bubbling phase.
+         *
+         * @see {@link https://api.jquery.com/event.currentTarget/}
+         * @since 1.3
+         */
+        currentTarget: TTarget;
+        /**
+         * An optional object of data passed to an event method when the current executing handler is bound.
+         *
+         * @see {@link https://api.jquery.com/event.data/}
+         * @since 1.1
+         */
+        data: TData;
+        /**
+         * The element where the currently-called jQuery event handler was attached.
+         *
+         * @see {@link https://api.jquery.com/event.delegateTarget/}
+         * @since 1.7
+         */
+        delegateTarget: TTarget;
         originalEvent: _Event;
-        new<T extends PlainObject>(event: string, properties?: T): JQuery.Event<TTarget> & T;
-        new<T extends PlainObject>(properties: T): JQuery.Event<TTarget> & T;
-        <T extends PlainObject>(event: string, properties?: T): JQuery.Event<TTarget> & T;
-        <T extends PlainObject>(properties: T): JQuery.Event<TTarget> & T;
+        /**
+         * The other DOM element involved in the event, if any.
+         *
+         * @see {@link https://api.jquery.com/event.relatedTarget/}
+         * @since 1.1.4
+         */
+        relatedTarget: TTarget | null;
+        /**
+         * The DOM element that initiated the event.
+         *
+         * @see {@link https://api.jquery.com/event.target/}
+         * @since 1.0
+         */
+        target: TTarget;
     }
 
+    // Static members
+    interface EventStatic<TTarget = EventTarget> {
+        <T extends object>(event: string, properties?: T): JQuery.Event<TTarget> & T;
+        <T extends EventLike>(properties: T): JQuery.Event<TTarget> & T;
+        new <T extends object>(event: string, properties?: T): JQuery.Event<TTarget> & T;
+        new <T extends EventLike>(properties: T): JQuery.Event<TTarget> & T;
+    }
+
+    interface EventLike {
+        type: string;
+    }
+
+    // endregion
+
     // Extra parameters can be passed from trigger()
     interface EventHandler<TContext, TData = null> {
         (this: TContext, eventObject: JQuery.Event<TContext, TData>, ...args: any[]): void | false | any;
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 1fda6e2da8..e88a470610 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4765,12 +4765,24 @@ function EffectsOptions() {
 }
 
 function _Event() {
-    function mixin() {
-        const e = $.Event('keydown', {
-            mySpecialKeyCode: JQuery.Key.CapsLock,
-        });
+    function call_signature() {
+        // $ExpectType Event<HTMLElement, null> & Coordinates
+        $.Event('keydown', $('p').offset());
 
-        e.mySpecialKeyCode === JQuery.Key.NumLock;
+        // $ExpectType Event<HTMLElement, null> & { type: string; }
+        $.Event({
+            type: 'keydown'
+        });
+    }
+
+    function constructor() {
+        // $ExpectType Event<HTMLElement, null> & Coordinates
+        new $.Event('keydown', $('p').offset());
+
+        // $ExpectType Event<HTMLElement, null> & { type: string; }
+        new $.Event({
+            type: 'keydown'
+        });
     }
 }
 

From 5f7c3a99b60a0f33252b0f280814a2963d40c626 Mon Sep 17 00:00:00 2001
From: YairTawil <yairtawil@gmail.com>
Date: Sun, 25 Jun 2017 09:48:26 +0300
Subject: [PATCH 026/287] add types for 'wellknown'

---
 types/wellknown/index.d.ts         | 12 ++++++++++++
 types/wellknown/tsconfig.json      | 22 ++++++++++++++++++++++
 types/wellknown/tslint.json        |  1 +
 types/wellknown/wellknown-tests.ts |  7 +++++++
 4 files changed, 42 insertions(+)
 create mode 100644 types/wellknown/index.d.ts
 create mode 100644 types/wellknown/tsconfig.json
 create mode 100644 types/wellknown/tslint.json
 create mode 100644 types/wellknown/wellknown-tests.ts

diff --git a/types/wellknown/index.d.ts b/types/wellknown/index.d.ts
new file mode 100644
index 0000000000..a79f3236bf
--- /dev/null
+++ b/types/wellknown/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for wellknown 0.5
+// Project: https://github.com/mapbox/wellknown#readme
+// Definitions by: Yair Tawil <https://github.com/yairtawil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = wellknown;
+
+declare namespace wellknown {
+    function parse(input: string): object;
+    function stringify(gj: {}): string;
+}
+
diff --git a/types/wellknown/tsconfig.json b/types/wellknown/tsconfig.json
new file mode 100644
index 0000000000..66be74a40f
--- /dev/null
+++ b/types/wellknown/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",
+        "wellknown-tests.ts"
+    ]
+}
diff --git a/types/wellknown/tslint.json b/types/wellknown/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/wellknown/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/wellknown/wellknown-tests.ts b/types/wellknown/wellknown-tests.ts
new file mode 100644
index 0000000000..7106927b88
--- /dev/null
+++ b/types/wellknown/wellknown-tests.ts
@@ -0,0 +1,7 @@
+import * as wellknown from './index';
+wellknown.parse("POINT(1 2)");
+const geoJson: {} = {
+    coordinates: [1, 2],
+    type: "Point"
+};
+wellknown.stringify(geoJson);

From 5e652d99e44750f609b95cf743c6dbe02110e602 Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <j.jimenez@tuta.io>
Date: Sun, 25 Jun 2017 19:33:25 +0200
Subject: [PATCH 027/287] electron-packager ignore type

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

diff --git a/types/electron-packager/index.d.ts b/types/electron-packager/index.d.ts
index e5fe985761..cd4e582a09 100644
--- a/types/electron-packager/index.d.ts
+++ b/types/electron-packager/index.d.ts
@@ -53,7 +53,7 @@ declare namespace ElectronPackager {
         /** The directory of cached electron downloads. Defaults to "$HOME/.electron". */
         cache?: string;
         /** Do not copy files into App whose filenames regex .match this string. */
-        ignore?: RegExp;
+        ignore?: RegExp | RegExp[] | { (path: string): boolean };
         /** Runs `npm prune --production` on the app. */
         prune?: boolean;
         /** If output directory for a platform already exists, replaces it rather than skipping it. */

From 22d76950f9ece9f35e9de4ab64b431b6ccd6b859 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 25 Jun 2017 13:52:07 -0400
Subject: [PATCH 028/287] [jquery] Add Promise type that supports 3 parameters.

---
 types/jquery/index.d.ts            | 553 +++++++++++++++++++++--------
 types/jquery/jquery-tests.ts       | 306 ++++++++++++++--
 types/jquery/test/example-tests.ts |   9 +-
 types/jquery/tslint.json           |   5 +-
 4 files changed, 682 insertions(+), 191 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 7a1443e9ad..309c13d5f3 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3265,9 +3265,20 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @since 1.12-2.2
      */
     uniqueSort<T extends Element>(array: T[]): T[];
-    when<T, U, V>(jqxhr1: JQuery.jqXHR<T>, jqxhr2: JQuery.jqXHR<U>, jqxhr3: JQuery.jqXHR<V>): JQuery.Promise<[T | U | V, string, JQuery.jqXHR<T | U | V>]>;
-    when<T, U>(jqxhr1: JQuery.jqXHR<T>, jqxhr2: JQuery.jqXHR<U>): JQuery.Promise<[T | U, string, JQuery.jqXHR<T | U>]>;
-    when<T>(jqxhr1: JQuery.jqXHR<T>): JQuery.Promise<T | string | JQuery.jqXHR<T>>;
+    when<T, U, V>(deferred1: T | JQuery.Thenable<T>,
+                  deferred2: U | JQuery.Thenable<U>,
+                  deferred3: V | JQuery.Thenable<V>): JQuery.Promise3<T, any, any, U, any, any, V>;
+    when<T>(deferred: T | JQuery.Thenable<T>): JQuery.Promise<T>;
+    when<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3,
+        BR1, BJ1, BN1, BR2, BJ2, BN2, BR3, BJ3, BN3,
+        CR1, CJ1, CN1, CR2, CJ2, CN2, CR3, CJ3, CN3>
+        (promiseA: JQuery.Promise3<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3>,
+         promiseB: JQuery.Promise3<BR1, BJ1, BN1, BR2, BJ2, BN2, BR3, BJ3, BN3>,
+         promiseC: JQuery.Promise3<CR1, CJ1, CN1, CR2, CJ2, CN2, CR3, CJ3, CN3>): JQuery.Promise3<[AR1, AR2, AR3], [AJ1, AJ2, AJ3], [AN1, AN2, AN3],
+        [BR1, BR2, BR3], [BJ1, BJ2, BJ3], [BN1, BN2, BN3],
+        [CR1, CR2, CR3], [CJ1, CJ2, CJ3], [CN1, CN2, CN3]>;
+    when<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3>
+        (promiseA: JQuery.Promise3<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3>): JQuery.Promise3<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -4030,97 +4041,14 @@ declare namespace JQuery {
     /**
      * @see {@link http://api.jquery.com/jquery.ajax/#jqXHR}
      */
-    interface jqXHR<TResolve = any> extends Pick<XMLHttpRequest, 'abort' | 'getAllResponseHeaders' | 'getResponseHeader' | 'overrideMimeType' | 'readyState' | 'responseText' |
-        'setRequestHeader' | 'status' | 'statusText'>,
+    interface jqXHR<TResolve = any> extends Promise3<TResolve, jqXHR<TResolve>, never,
+        Ajax.SuccessTextStatus, Ajax.ErrorTextStatus, never,
+        jqXHR<TResolve>, string, never>,
+        Pick<XMLHttpRequest, 'abort' | 'getAllResponseHeaders' | 'getResponseHeader' | 'overrideMimeType' | 'readyState' | 'responseText' |
+            'setRequestHeader' | 'status' | 'statusText'>,
         Partial<Pick<XMLHttpRequest, 'responseXML'>> {
         responseJSON?: any;
 
-        /**
-         * Add handlers to be called when the Deferred object is either resolved or rejected.
-         *
-         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
-         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-         * @see {@link https://api.jquery.com/deferred.always/}
-         * @since 1.6
-         */
-        always(alwaysCallback: TypeOrArray<jqXHR.AlwaysCallback<TResolve>>,
-               ...alwaysCallbacks: Array<TypeOrArray<jqXHR.AlwaysCallback<TResolve>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object is rejected.
-         *
-         * @param failFilter A function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.catch/}
-         * @since 3.0
-         */
-        catch(failFilter: (jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => never): Deferred<never, any, never>;
-        /**
-         * Add handlers to be called when the Deferred object is rejected.
-         *
-         * @param failFilter A function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.catch/}
-         * @since 3.0
-         */
-        catch<UResolve>(failFilter: (jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => UResolve | Thenable<UResolve>): Deferred<UResolve, never>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved.
-         *
-         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
-         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.done/}
-         * @since 1.5
-         */
-        done(doneCallback: TypeOrArray<jqXHR.DoneCallback<TResolve>>,
-             ...doneCallbacks: Array<TypeOrArray<jqXHR.DoneCallback<TResolve>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object is rejected.
-         *
-         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
-         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.fail/}
-         * @since 1.5
-         */
-        fail(failCallback: TypeOrArray<jqXHR.FailCallback<this>>,
-             ...failCallbacks: Array<TypeOrArray<jqXHR.FailCallback<this>>>): this;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<UResolve, UReject>(doneFilter: ((data: TResolve, textStatus: Ajax.SuccessTextStatus, jqXHR: this) => UResolve | Thenable<UResolve>) | null,
-                                failFilter?: ((jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => UReject | Thenable<UReject>) | null): Deferred<UResolve | UReject>;
-        // jQuery doesn't send progress notifications so progress callbacks will never be called.
-        // Leaving progress() in however allows for structural compatibility with JQuery.Promise.
-        /**
-         * Add handlers to be called when the Deferred object generates progress notifications.
-         *
-         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
-         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
-         *                          progress notifications.
-         * @see {@link https://api.jquery.com/deferred.progress/}
-         * @since 1.7
-         */
-        progress(progressCallback: TypeOrArray<Function>,
-                 ...progressCallbacks: Array<TypeOrArray<Function>>): this;
-        /**
-         * Return a Deferred's Promise object.
-         *
-         * @param target Object onto which the promise methods have to be attached
-         * @see {@link https://api.jquery.com/deferred.promise/}
-         * @since 1.5
-         */
-        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TResolve | Ajax.TextStatus | this> & TTarget;
-        /**
-         * Return a Deferred's Promise object.
-         *
-         * @see {@link https://api.jquery.com/deferred.promise/}
-         * @since 1.5
-         */
-        promise(): JQuery.Promise<TResolve | Ajax.TextStatus | this>;
         /**
          * Determine the current state of a Deferred object.
          *
@@ -4129,31 +4057,23 @@ declare namespace JQuery {
          */
         state(): 'pending' | 'resolved' | 'rejected';
         statusCode(map: Ajax.StatusCodeCallbacks<any>): void;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<UResolve = never,
-            UReject = never>(doneFilter: ((data: TResolve, textStatus: Ajax.SuccessTextStatus, jqXHR: this) => UResolve | Thenable<UResolve>) | null,
-                             failFilter?: ((jqXHR: this, textStatus: Ajax.ErrorTextStatus, errorThrown: string) => UReject | Thenable<UReject>) | null): Deferred<UResolve | UReject>;
     }
 
     namespace jqXHR {
-        interface DoneCallback<TResolve = any> {
-            (data: TResolve, textStatus: Ajax.SuccessTextStatus, jqXHR: jqXHR<TResolve>): void;
-        }
+        /**
+         * @deprecated
+         */
+        interface DoneCallback<TResolve = any, TjqXHR = jqXHR<TResolve>> extends Deferred.Callback3<TResolve, Ajax.SuccessTextStatus, TjqXHR> { }
 
-        interface FailCallback<TResolve> {
-            (jqXHR: TResolve, textStatus: Ajax.ErrorTextStatus, errorThrown: string): void;
-        }
+        /**
+         * @deprecated
+         */
+        interface FailCallback<TjqXHR> extends Deferred.Callback3<TjqXHR, Ajax.ErrorTextStatus, string> { }
 
-        interface AlwaysCallback<TResolve = any> {
-            (data_jqXHR: TResolve | jqXHR<TResolve>, textStatus: Ajax.TextStatus, jqXHR_errorThrown: jqXHR<TResolve> | string): void;
-        }
+        /**
+         * @deprecated
+         */
+        interface AlwaysCallback<TResolve = any, TjqXHR = jqXHR<TResolve>> extends Deferred.Callback3<TResolve | TjqXHR, Ajax.TextStatus, TjqXHR | string> { }
     }
 
     // endregion
@@ -4275,6 +4195,37 @@ declare namespace JQuery {
          * @since 3.0
          */
         catch<UResolve>(failFilter: (...reasons: TReject[]) => UResolve | Thenable<UResolve>): Deferred<UResolve, TReject, TNotify>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<UResolve = TResolve,
+            UReject = TReject,
+            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
+                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
+                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<UResolve = TResolve,
+            UReject = TReject,
+            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
+                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
+                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
+
         /**
          * Call the progressCallbacks on a Deferred object with the given args.
          *
@@ -4292,22 +4243,6 @@ declare namespace JQuery {
          * @since 1.7
          */
         notifyWith(context: object, args?: ArrayLike<TNotify>): this;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<UResolve = TResolve,
-            UReject = TReject,
-            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
-                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
-                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
         /**
          * Reject a Deferred object and call any failCallbacks with the given args.
          *
@@ -4342,38 +4277,40 @@ declare namespace JQuery {
          * @since 1.5
          */
         resolveWith(context: object, args?: ArrayLike<TResolve>): this;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<UResolve = TResolve,
-            UReject = TReject,
-            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
-                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
-                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
     }
 
     namespace Deferred {
-        interface DoneCallback<TResolve> {
-            (...values: TResolve[]): void;
+        interface Callback3<T, U, V> {
+            (t: T, u: U, v: V): void;
         }
 
-        interface FailCallback<TReject> {
-            (...reasons: TReject[]): void;
+        interface Callback2<T, U> {
+            (t: T, u: U): void;
         }
 
-        interface AlwaysCallback<TResolve, TReject> {
-            (...values_reasons: Array<TResolve | TReject>): void;
+        interface Callback<T> {
+            (...args: T[]): void;
         }
 
-        interface ProgressCallback<TNotify> {
-            (...values: TNotify[]): void;
-        }
+        /**
+         * @deprecated
+         */
+        interface DoneCallback<TResolve> extends Callback<TResolve> { }
+
+        /**
+         * @deprecated
+         */
+        interface FailCallback<TReject> extends Callback<TReject> { }
+
+        /**
+         * @deprecated
+         */
+        interface AlwaysCallback<TResolve, TReject> extends Callback<TResolve | TReject> { }
+
+        /**
+         * @deprecated
+         */
+        interface ProgressCallback<TNotify> extends Callback<TNotify> { }
 
         // Common interface for Deferred and Promise
         interface PromiseBase<TResolve, TReject, TNotify> {
@@ -4443,6 +4380,318 @@ declare namespace JQuery {
         }
     }
 
+    /**
+     * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
+     * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
+     *
+     * @see {@link http://api.jquery.com/Types/#Promise}
+     */
+    interface Promise3<TR, TJ, TN,
+        UR, UJ, UN,
+        VR, VJ = any, VN = any> {
+        /**
+         * Add handlers to be called when the Deferred object is either resolved or rejected.
+         *
+         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
+         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+         * @see {@link https://api.jquery.com/deferred.always/}
+         * @since 1.6
+         */
+        always(alwaysCallback: TypeOrArray<Deferred.Callback3<TR | TJ, UR | UJ, VR | VJ>>,
+               ...alwaysCallbacks: Array<TypeOrArray<Deferred.Callback3<TR | TJ, UR | UJ, VR | VJ>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is resolved.
+         *
+         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
+         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.done/}
+         * @since 1.5
+         */
+        done(doneCallback: TypeOrArray<Deferred.Callback3<TR, UR, VR>>,
+             ...doneCallbacks: Array<TypeOrArray<Deferred.Callback3<TR, UR, VR>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
+         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.fail/}
+         * @since 1.5
+         */
+        fail(failCallback: TypeOrArray<Deferred.Callback3<TJ, UJ, VJ>>,
+             ...failCallbacks: Array<TypeOrArray<Deferred.Callback3<TJ, UJ, VJ>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object generates progress notifications.
+         *
+         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
+         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
+         *                          progress notifications.
+         * @see {@link https://api.jquery.com/deferred.progress/}
+         * @since 1.7
+         */
+        progress(progressCallback: TypeOrArray<Deferred.Callback3<TN, UN, VN>>,
+                 ...progressCallbacks: Array<TypeOrArray<Deferred.Callback3<TN, UN, VN>>>): this;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @param target Object onto which the promise methods have to be attached
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise<TTarget extends object>(target: TTarget): this & TTarget;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise(): this;
+        /**
+         * Determine the current state of a Deferred object.
+         *
+         * @see {@link https://api.jquery.com/deferred.state/}
+         * @since 1.7
+         */
+        state(): 'pending' | 'resolved' | 'rejected';
+
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failFilter A function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.catch/}
+         * @since 3.0
+         */
+        catch<AR, AJ = never, AN = TN,
+            BR = never, BJ = never, BN = UN,
+            CR = never, CJ = never, CN = VN>
+            (failFilter: (t: TJ, u: UJ, v: VJ) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
+            BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never,
+            CR1 = never, CR2 = never, CR3 = never, CJ1 = never, CJ2 = never, CJ3 = never, CN1 = CN3, CN2 = CN3, CN3 = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+             failFilter: (t: TJ, u: UJ, v: VJ) => AR2 | Thenable<AR2> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>,
+             progressFilter: (t: TN, u: UN, v: VN) => AN3 | Thenable<AN3> | Promise3<AR3, AJ3, AN3, BR3, BJ3, BN3, CR3, CJ3, CN3>): Promise3<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
+            BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3,
+            CR1 | CR2 | CR3, CJ1 | CJ2 | CJ3, CN1 | CN2 | CN3>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
+            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ, v: VJ) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+             progressFilter: (t: TN, u: UN, v: VN) => AN1 | Thenable<AN1> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
+            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
+            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
+            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN, v: VN) => AN1 | Thenable<AN1> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
+            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR = TJ, AJ = TJ, AN = TN,
+            BR = UJ, BJ = UJ, BN = never,
+            CR = VJ, CJ = VJ, CN = never>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN, v: VN) => AN | Thenable<AN> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN,
+            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = VN, CN2 = VN>
+            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+             failFilter: (t: TJ, u: UJ, v: VJ) => AR2 | Thenable<AR2> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
+            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR, AJ = never, AN = TN,
+            BR = never, BJ = never, BN = UN,
+            CR = never, CJ = never, CN = VN>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ, v: VJ) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR, AJ = TJ, AN = TN,
+            BR = never, BJ = UJ, BN = UN,
+            CR = never, CJ = VJ, CN = VN>
+            (doneFilter: (t: TR, u: UR, v: VR) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
+            BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never,
+            CR1 = never, CR2 = never, CR3 = never, CJ1 = never, CJ2 = never, CJ3 = never, CN1 = CN3, CN2 = CN3, CN3 = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+             failFilter: (t: TJ, u: UJ, v: VJ) => AR2 | Thenable<AR2> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>,
+             progressFilter: (t: TN, u: UN, v: VN) => AN3 | Thenable<AN3> | Promise3<AR3, AJ3, AN3, BR3, BJ3, BN3, CR3, CJ3, CN3>): Promise3<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
+            BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3,
+            CR1 | CR2 | CR3, CJ1 | CJ2 | CJ3, CN1 | CN2 | CN3>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
+            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ, v: VJ) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+             progressFilter: (t: TN, u: UN, v: VN) => AN1 | Thenable<AN1> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
+            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
+            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
+            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN, v: VN) => AN1 | Thenable<AN1> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
+            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR = TJ, AJ = TJ, AN = TN,
+            BR = UJ, BJ = UJ, BN = never,
+            CR = VJ, CJ = VJ, CN = never>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN, v: VN) => AN | Thenable<AN> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN,
+            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = VN, CN2 = VN>
+            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+             failFilter: (t: TJ, u: UJ, v: VJ) => AR2 | Thenable<AR2> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
+            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR, AJ = never, AN = TN,
+            BR = never, BJ = never, BN = UN,
+            CR = never, CJ = never, CN = VN>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ, v: VJ) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR, AJ = TJ, AN = TN,
+            BR = never, BJ = UJ, BN = UN,
+            CR = never, CJ = VJ, CN = VN>
+            (doneFilter: (t: TR, u: UR, v: VR) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+    }
+
     /**
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
@@ -4473,7 +4722,7 @@ declare namespace JQuery {
             UReject = TReject,
             UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
                                failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
-                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Promise<UResolve, UReject, UNotify>;
+                               progressFilter?: ((...values: TNotify[]) => UNotify | Thenable<UNotify>) | null): Promise<UResolve, UReject, UNotify>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4487,7 +4736,7 @@ declare namespace JQuery {
             UReject = TReject,
             UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
                                failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
-                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Promise<UResolve, UReject, UNotify>;
+                               progressFilter?: ((...values: TNotify[]) => UNotify | Thenable<UNotify>) | null): Promise<UResolve, UReject, UNotify>;
     }
 
     // endregion
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index e88a470610..f955d3708c 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4433,24 +4433,172 @@ function JQueryStatic() {
     }
 
     function when() {
-        const t = $.ajax() as JQuery.jqXHR<string>;
-        const u = $.ajax() as JQuery.jqXHR<number>;
-        const v = $.ajax() as JQuery.jqXHR<boolean>;
+        function Promise3() {
+            const t = $.ajax() as JQuery.jqXHR<string>;
+            const u = $.ajax() as JQuery.jqXHR<number>;
+            const v = $.ajax() as JQuery.jqXHR<boolean>;
 
-        // $ExpectType Promise<[string | number | boolean, string, jqXHR<string | number | boolean>], any, any>
-        $.when(t, u, v);
+            // 3 parameters
+            {
+                const w = $.when(t, u, v);
 
-        // $ExpectType Promise<[string | number, string, jqXHR<string | number>], any, any>
-        $.when(t, u);
+                w.then((a, b, c) => {
+                    // $ExpectType [string, SuccessTextStatus, jqXHR<string>]
+                    a;
+                    // $ExpectType [number, SuccessTextStatus, jqXHR<number>]
+                    b;
+                    // $ExpectType [boolean, SuccessTextStatus, jqXHR<boolean>]
+                    c;
+                });
+                w.catch((a, b, c) => {
+                    // $ExpectType [jqXHR<string>, ErrorTextStatus, string]
+                    a;
+                    // $ExpectType [jqXHR<number>, ErrorTextStatus, string]
+                    b;
+                    // $ExpectType [jqXHR<boolean>, ErrorTextStatus, string]
+                    c;
+                });
+                w.then(null, null, (a, b, c) => {
+                    // $ExpectType [never, never, never]
+                    a;
+                    // $ExpectType [never, never, never]
+                    b;
+                    // $ExpectType [never, never, never]
+                    c;
+                });
+            }
 
-        // $ExpectType Promise<string | jqXHR<string>, any, any>
-        $.when(t);
+            // 2 parameters
+            {
+                const w = $.when(t, u);
+
+                w.then((a, b) => {
+                    // $ExpectType [string, SuccessTextStatus, jqXHR<string>]
+                    a;
+                    // $ExpectType [number, SuccessTextStatus, jqXHR<number>]
+                    b;
+                });
+                w.catch((a, b) => {
+                    // $ExpectType [jqXHR<string>, ErrorTextStatus, string]
+                    a;
+                    // $ExpectType [jqXHR<number>, ErrorTextStatus, string]
+                    b;
+                });
+                w.then(null, null, (a, b) => {
+                    // $ExpectType [never, never, never]
+                    a;
+                    // $ExpectType [never, never, never]
+                    b;
+                });
+            }
+
+            // 1 parameter
+            {
+                const w = $.when(t);
+
+                w.then((data, textStatus, jqXHR) => {
+                    // $ExpectType string
+                    data;
+                    // $ExpectType SuccessTextStatus
+                    textStatus;
+                    // $ExpectType jqXHR<string>
+                    jqXHR;
+                });
+                w.catch((jqXHR, textStatus, errorThrown) => {
+                    // $ExpectType jqXHR<string>
+                    jqXHR;
+                    // $ExpectType ErrorTextStatus
+                    textStatus;
+                    // $ExpectType string
+                    errorThrown;
+                });
+                w.then(null, null, (a, b, c) => {
+                    // $ExpectType never
+                    a;
+                    // $ExpectType never
+                    b;
+                    // $ExpectType never
+                    c;
+                });
+            }
+        }
 
         // $ExpectType Promise<any, any, any>
         $.when($.Deferred());
 
         // $ExpectType Promise<any, any, any>
         $.when();
+
+        // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/2725
+        function issue_2725() {
+            function first() {
+                return $.when('1');
+            }
+
+            $.when().then(() => {
+                const f = first();
+                // $ExpectType Promise<string, any, any>
+                f;
+
+                return f;
+            }).then((value) => {
+                // $ExpectType string
+                value;
+            });
+        }
+
+        // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/10159
+        function issue_10159() {
+            interface One { result: number; }
+            interface Two { Result: number; }
+            interface Three { TheResult: number; }
+
+            class AsyncRunner {
+                Run(): void {
+                    const task1 = this.runTask1();
+                    const task2 = this.runTask2();
+                    const task3 = this.runTask3();
+
+                    // $ExpectType Promise<One, any, any>
+                    task1;
+                    // $ExpectType Promise<Two, any, any>
+                    task2;
+                    // $ExpectType Promise<Three, any, any>
+                    task3;
+
+                    $.when(task1, task2, task3)
+                        .done((r1, r2, r3) => {
+                            // $ExpectType One
+                            r1;
+                            // $ExpectType Two
+                            r2;
+                            // $ExpectType Three
+                            r3;
+                        });
+                }
+
+                runTask1() {
+                    let dfd = $.Deferred<One>();
+                    console.log('Task 1');
+                    setTimeout(() => { dfd.resolve({ result: 1 }); }, Math.floor(400 + Math.random() * 2000));
+                    return dfd.promise();
+                }
+
+                runTask2() {
+                    let dfd = $.Deferred<Two>();
+                    console.log('Task 2');
+                    setTimeout(() => { dfd.resolve({ Result: 2 }); }, Math.floor(400 + Math.random() * 2000));
+                    return dfd.promise();
+                }
+
+                runTask3() {
+                    let dfd = $.Deferred<Three>();
+                    console.log('Task 3');
+                    setTimeout(() => { dfd.resolve({ TheResult: 3 }); }, Math.floor(400 + Math.random() * 2000));
+                    return dfd.promise();
+                }
+            }
+        }
     }
 }
 
@@ -5028,7 +5176,7 @@ function jqXHR() {
     }
 
     function _catch() {
-        // $ExpectType Deferred<void, never, any>
+        // $ExpectType Promise3<void, never, never, never, never, never, never, never, never>
         $.ajax('/echo').catch((jqXHR, textStatus, errorThrown) => {
             // $ExpectType jqXHR<any>
             jqXHR;
@@ -5039,30 +5187,126 @@ function jqXHR() {
         });
     }
 
-    function catch_throw_returnType() {
-        // $ExpectType Deferred<never, any, never>
-        $.ajax('/echo').catch((reason) => {
-            throw new Error();
-        });
-    }
-
     function then_returnType() {
-        // $ExpectType Deferred<void, any, any>
-        $.ajax('/echo').then(() => { });
+        // $ExpectType Promise3<void, jqXHR<any>, never, never, ErrorTextStatus, never, never, string, never>
+        $.ajax('/echo/json').then(() => { });
+    }
+}
+
+function Promise3() {
+    function then() {
+        function doneFilter() {
+            // $ExpectType Promise3<number, jqXHR<any>, never, never, ErrorTextStatus, never, never, string, never>
+            $.ajax('/echo/json').then(() => {
+                return 1;
+            });
+
+            // $ExpectType Promise3<string, jqXHR<any>, never, never, ErrorTextStatus, never, never, string, never>
+            $.ajax('/echo/json').then(() => {
+                const t: JQuery.Thenable<string> = {
+                    then() {
+                        return Promise.resolve('myValue');
+                    }
+                };
+
+                return t;
+            });
+
+            // $ExpectType Promise3<any, jqXHR<any>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<any>, string, never>
+            $.ajax('/echo/json').then(() => {
+                return $.ajax('/echo/json');
+            });
+        }
+
+        function null_failFilter() {
+            // $ExpectType Promise3<number, never, never, never, never, never, never, never, never>
+            $.ajax('/echo/json').then(null, () => {
+                return 1;
+            });
+
+            // $ExpectType Promise3<string, never, never, never, never, never, never, never, never>
+            $.ajax('/echo/json').then(null, () => {
+                const t: JQuery.Thenable<string> = {
+                    then() {
+                        return Promise.resolve('myValue');
+                    }
+                };
+
+                return t;
+            });
+
+            // $ExpectType Promise3<any, jqXHR<any>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<any>, string, never>
+            $.ajax('/echo/json').then(null, () => {
+                return $.ajax('/echo/json');
+            });
+        }
+
+        function doneFilter_failFilter() {
+            const value = () => {
+                return 1;
+            };
+            const thenable = () => {
+                const t: JQuery.Thenable<string> = {
+                    then() {
+                        return Promise.resolve('myValue');
+                    }
+                };
+
+                return t;
+            };
+            const promise3 = () => {
+                return $.ajax('/echo/json') as JQuery.jqXHR<boolean>;
+            };
+
+            // $ExpectType Promise3<number, never, never, never, never, never, never, never, never>
+            $.ajax('/echo/json').then(value, value);
+
+            // $ExpectType Promise3<string, never, never, never, never, never, never, never, never>
+            $.ajax('/echo/json').then(thenable, thenable);
+
+            // $ExpectType Promise3<boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
+            $.ajax('/echo/json').then(promise3, promise3);
+
+            // $ExpectType Promise3<string | number, never, never, never, never, never, never, never, never>
+            $.ajax('/echo/json').then(value, thenable);
+
+            // $ExpectType Promise3<string | number, never, never, never, never, never, never, never, never>
+            $.ajax('/echo/json').then(thenable, value);
+
+            // $ExpectType Promise3<number | boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
+            $.ajax('/echo/json').then(value, promise3);
+
+            // $ExpectType Promise3<number | boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
+            $.ajax('/echo/json').then(promise3, value);
+
+            // $ExpectType Promise3<string | boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
+            $.ajax('/echo/json').then(thenable, promise3);
+
+            // $ExpectType Promise3<string | boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
+            $.ajax('/echo/json').then(promise3, thenable);
+        }
     }
 
-    function throw_from_catch() {
-        $.ajax('/echo').catch(() => {
-            throw new Error('Thrown from [jQuery] 1st catch block');
-        }).then((value) => {
-            // $ExpectType never
-            value;
-        }).catch((reason) => {
-            // $ExpectType any
-            reason;
-        }).then((value) => {
-            // $ExpectType void
-            value;
+    function _catch() {
+        // $ExpectType Promise3<number, never, never, never, never, never, never, never, never>
+        $.ajax('/echo/json').catch(() => {
+            return 1;
+        });
+
+        // $ExpectType Promise3<string, never, never, never, never, never, never, never, never>
+        $.ajax('/echo/json').catch(() => {
+            const t: JQuery.Thenable<string> = {
+                then() {
+                    return Promise.resolve('myValue');
+                }
+            };
+
+            return t;
+        });
+
+        // $ExpectType Promise3<any, jqXHR<any>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<any>, string, never>
+        $.ajax('/echo/json').catch(() => {
+            return $.ajax('/echo/json');
         });
     }
 }
diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
index 404aba2013..f59f8a3acc 100644
--- a/types/jquery/test/example-tests.ts
+++ b/types/jquery/test/example-tests.ts
@@ -1202,14 +1202,13 @@ function examples() {
         // Attach a done, fail, and progress handler for the asyncEvent
         $.when(asyncEvent()).then(
             function(status) {
-                status === 3;
                 alert(status + ', things are going well');
             },
             function(status) {
                 alert(status + ', you fail this time');
             },
             function(status) {
-                // $('body').append(status);
+                $('body').append(status);
             },
         );
     }
@@ -1233,9 +1232,7 @@ function examples() {
         // Use the object as a Promise
         _obj.done(function(name) {
             _obj.hello(name); // Will alert "Hello John"
-        });
-        /// TODO: This doesn't work even though .done() returns this
-        //     .hello('Karl'); // Will alert "Hello Karl"
+        }).hello('Karl'); // Will alert "Hello Karl"
     }
 
     function deferred_then_0() {
@@ -1392,7 +1389,7 @@ function examples() {
     function each_2() {
         $('button').click(function() {
             $('div').each(function(index, element) {
-                // element == this
+                // element == this;
                 $(element).css('backgroundColor', 'yellow');
                 if ($(this).is('#stop')) {
                     $('span').text('Stopped at div index #' + index);
diff --git a/types/jquery/tslint.json b/types/jquery/tslint.json
index 401b7a77e9..ca514c4aba 100644
--- a/types/jquery/tslint.json
+++ b/types/jquery/tslint.json
@@ -2,8 +2,9 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "ban-types": false,
-        "no-misused-new": false,
+        "callable-types": false,
         "no-empty-interface": false,
-        "callable-types": false
+        "no-misused-new": false,
+        "space-before-function-paren": false
     }
 }

From 85c09b5387f3453894c5d80b30af7f7fe7c5f4ae Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 25 Jun 2017 15:02:46 -0400
Subject: [PATCH 029/287] [jquery] Add Promise type that supports 2 parameters.

---
 types/jquery/index.d.ts      | 399 +++++++++++++++++++++++++++++++++--
 types/jquery/jquery-tests.ts |  90 +++++++-
 2 files changed, 471 insertions(+), 18 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 309c13d5f3..2fc6a38f22 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3265,20 +3265,101 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @since 1.12-2.2
      */
     uniqueSort<T extends Element>(array: T[]): T[];
-    when<T, U, V>(deferred1: T | JQuery.Thenable<T>,
-                  deferred2: U | JQuery.Thenable<U>,
-                  deferred3: V | JQuery.Thenable<V>): JQuery.Promise3<T, any, any, U, any, any, V>;
-    when<T>(deferred: T | JQuery.Thenable<T>): JQuery.Promise<T>;
-    when<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3,
-        BR1, BJ1, BN1, BR2, BJ2, BN2, BR3, BJ3, BN3,
-        CR1, CJ1, CN1, CR2, CJ2, CN2, CR3, CJ3, CN3>
-        (promiseA: JQuery.Promise3<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3>,
-         promiseB: JQuery.Promise3<BR1, BJ1, BN1, BR2, BJ2, BN2, BR3, BJ3, BN3>,
-         promiseC: JQuery.Promise3<CR1, CJ1, CN1, CR2, CJ2, CN2, CR3, CJ3, CN3>): JQuery.Promise3<[AR1, AR2, AR3], [AJ1, AJ2, AJ3], [AN1, AN2, AN3],
-        [BR1, BR2, BR3], [BJ1, BJ2, BJ3], [BN1, BN2, BN3],
-        [CR1, CR2, CR3], [CJ1, CJ2, CJ3], [CN1, CN2, CN3]>;
-    when<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3>
-        (promiseA: JQuery.Promise3<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3>): JQuery.Promise3<AR1, AJ1, AN1, AR2, AJ2, AN2, AR3, AJ3, AN3>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when<TR1, TJ1 = any, TN1 = any,
+        UR1 = any, UJ1 = any, UN1 = any,
+        VR1 = any, VJ1 = any, VN1 = any>
+        (deferredT: TR1 | JQuery.Thenable<TR1> | JQuery.Promise<TR1, TJ1, TN1>,
+         deferredU: UR1 | JQuery.Thenable<UR1> | JQuery.Promise<UR1, UJ1, UN1>,
+         deferredV: VR1 | JQuery.Thenable<VR1> | JQuery.Promise<VR1, VJ1, VN1>): JQuery.Promise3<TR1, TJ1, TN1, UR1, UJ1, UN1, VR1, VJ1, VN1>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when<TR1, TJ1, TN1,
+        TR2, TJ2, TN2,
+        TR3 = never, TJ3 = never, TN3 = never,
+        UR1 = never, UJ1 = never, UN1 = never,
+        UR2 = never, UJ2 = never, UN2 = never,
+        UR3 = never, UJ3 = never, UN3 = never,
+        VR1 = never, VJ1 = never, VN1 = never,
+        VR2 = never, VJ2 = never, VN2 = never,
+        VR3 = never, VJ3 = never, VN3 = never>
+        (deferredT: JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2> |
+             JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3>,
+         deferredU: JQuery.Promise2<UR1, UJ1, UN1, UR2, UJ2, UN2> |
+             JQuery.Promise3<UR1, UJ1, UN1, UR2, UJ2, UN2, UR3, UJ3, UN3>,
+         deferredV: JQuery.Promise2<VR1, VJ1, VN1, VR2, VJ2, VN2> |
+             JQuery.Promise3<VR1, VJ1, VN1, VR2, VJ2, VN2, VR3, VJ3, VN3>): JQuery.Promise3<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], [TN1, TN2, TN3],
+        [UR1, UR2, UR3], [UJ1, UJ2, UJ3], [UN1, UN2, UN3],
+        [VR1, VR2, VR3], [VJ1, VJ2, VJ3], [VN1, VN2, VN3]>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when<TR1, TJ1 = any, TN1 = any,
+        UR1 = any, UJ1 = any, UN1 = any>
+        (deferredT: TR1 | JQuery.Thenable<TR1> | JQuery.Promise<TR1, TJ1, TN1>,
+         deferredU: UR1 | JQuery.Thenable<UR1> | JQuery.Promise<UR1, UJ1, UN1>): JQuery.Promise2<TR1, TJ1, TN1, UR1, UJ1, UN1>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when<TR1, TJ1, TN1,
+        TR2, TJ2, TN2,
+        TR3 = never, TJ3 = never, TN3 = never,
+        UR1 = never, UJ1 = never, UN1 = never,
+        UR2 = never, UJ2 = never, UN2 = never,
+        UR3 = never, UJ3 = never, UN3 = never>
+        (deferredT: JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2> |
+             JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3>,
+         deferredU: JQuery.Promise2<UR1, UJ1, UN1, UR2, UJ2, UN2> |
+             JQuery.Promise3<UR1, UJ1, UN1, UR2, UJ2, UN2, UR3, UJ3, UN3>): JQuery.Promise2<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], [TN1, TN2, TN3],
+        [UR1, UR2, UR3], [UJ1, UJ2, UJ3], [UN1, UN2, UN3]>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when<TR1, TJ1 = any, TN1 = any>(deferred: TR1 | JQuery.Thenable<TR1> | JQuery.Promise<TR1, TJ1, TN1>): JQuery.Promise<TR1, TJ1, TN1>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when<TR1, TJ1, TN1,
+        TR2, TJ2, TN2,
+        TR3, TJ3, TN3>
+        (deferredT: JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3>): JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when<TR1, TJ1, TN1,
+        TR2, TJ2, TN2>
+        (deferredT: JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>): JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3287,7 +3368,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when(...deferreds: any[]): JQuery.Promise<any>;
+    when<TR1 = never, TJ1 = never, TN1 = never>(...deferreds: Array<TR1 | JQuery.Thenable<TR1>>): JQuery.Promise<TR1, TJ1, TN1>;
 }
 
 declare namespace JQuery {
@@ -4692,6 +4773,294 @@ declare namespace JQuery {
             (doneFilter: (t: TR, u: UR, v: VR) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
     }
 
+    /**
+     * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
+     * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
+     *
+     * @see {@link http://api.jquery.com/Types/#Promise}
+     */
+    interface Promise2<TR, TJ, TN,
+        UR, UJ = any, UN = any> {
+        /**
+         * Add handlers to be called when the Deferred object is either resolved or rejected.
+         *
+         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
+         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+         * @see {@link https://api.jquery.com/deferred.always/}
+         * @since 1.6
+         */
+        always(alwaysCallback: TypeOrArray<Deferred.Callback2<TR | TJ, UR | UJ>>,
+               ...alwaysCallbacks: Array<TypeOrArray<Deferred.Callback2<TR | TJ, UR | UJ>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is resolved.
+         *
+         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
+         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.done/}
+         * @since 1.5
+         */
+        done(doneCallback: TypeOrArray<Deferred.Callback2<TR, UR>>,
+             ...doneCallbacks: Array<TypeOrArray<Deferred.Callback2<TR, UR>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
+         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.fail/}
+         * @since 1.5
+         */
+        fail(failCallback: TypeOrArray<Deferred.Callback2<TJ, UJ>>,
+             ...failCallbacks: Array<TypeOrArray<Deferred.Callback2<TJ, UJ>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object generates progress notifications.
+         *
+         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
+         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
+         *                          progress notifications.
+         * @see {@link https://api.jquery.com/deferred.progress/}
+         * @since 1.7
+         */
+        progress(progressCallback: TypeOrArray<Deferred.Callback2<TN, UN>>,
+                 ...progressCallbacks: Array<TypeOrArray<Deferred.Callback2<TN, UN>>>): this;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @param target Object onto which the promise methods have to be attached
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise<TTarget extends object>(target: TTarget): this & TTarget;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise(): this;
+        /**
+         * Determine the current state of a Deferred object.
+         *
+         * @see {@link https://api.jquery.com/deferred.state/}
+         * @since 1.7
+         */
+        state(): 'pending' | 'resolved' | 'rejected';
+
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failFilter A function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.catch/}
+         * @since 3.0
+         */
+        catch<AR, AJ = never, AN = TN,
+            BR = never, BJ = never, BN = UN>
+            (failFilter: (t: TJ, u: UJ) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
+            BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never>
+            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+             failFilter: (t: TJ, u: UJ) => AR2 | Thenable<AR2> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>,
+             progressFilter: (t: TN, u: UN) => AN3 | Thenable<AN3> | Promise2<AR3, AJ3, AN3, BR3, BJ3, BN3>): Promise2<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
+            BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+             progressFilter: (t: TN, u: UN) => AN1 | Thenable<AN1> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
+            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN) => AN1 | Thenable<AN1> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR = TJ, AJ = TJ, AN = TN,
+            BR = UJ, BJ = UJ, BN = never>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN) => AN | Thenable<AN> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN>
+            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+             failFilter: (t: TJ, u: UJ) => AR2 | Thenable<AR2> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR, AJ = never, AN = TN,
+            BR = never, BJ = never, BN = UN>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR, AJ = TJ, AN = TN,
+            BR = never, BJ = UJ, BN = UN>
+            (doneFilter: (t: TR, u: UR) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
+            BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never>
+            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+             failFilter: (t: TJ, u: UJ) => AR2 | Thenable<AR2> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>,
+             progressFilter: (t: TN, u: UN) => AN3 | Thenable<AN3> | Promise2<AR3, AJ3, AN3, BR3, BJ3, BN3>): Promise2<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
+            BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+             progressFilter: (t: TN, u: UN) => AN1 | Thenable<AN1> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
+            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN) => AN1 | Thenable<AN1> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR = TJ, AJ = TJ, AN = TN,
+            BR = UJ, BJ = UJ, BN = never>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN) => AN | Thenable<AN> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
+            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN>
+            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+             failFilter: (t: TJ, u: UJ) => AR2 | Thenable<AR2> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR, AJ = never, AN = TN,
+            BR = never, BJ = never, BN = UN>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR, AJ = TJ, AN = TN,
+            BR = never, BJ = UJ, BN = UN>
+            (doneFilter: (t: TR, u: UR) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+    }
+
     /**
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index f955d3708c..478e1390a4 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4523,10 +4523,94 @@ function JQueryStatic() {
             }
         }
 
-        // $ExpectType Promise<any, any, any>
-        $.when($.Deferred());
+        function Promise2() {
+            const t = $.Deferred() as JQuery.Promise2<string, Error, number, boolean>;
+            const u = $.Deferred() as JQuery.Promise2<string, Error, number, boolean>;
+            const v = $.Deferred() as JQuery.Promise2<string, Error, number, boolean>;
 
-        // $ExpectType Promise<any, any, any>
+            // 3 parameters
+            {
+                const w = $.when(t, u, v);
+
+                w.then((a, b, c) => {
+                    // $ExpectType [string, boolean, never]
+                    a;
+                    // $ExpectType [string, boolean, never]
+                    b;
+                    // $ExpectType [string, boolean, never]
+                    c;
+                });
+                w.catch((a, b, c) => {
+                    // $ExpectType [Error, any, never]
+                    a;
+                    // $ExpectType [Error, any, never]
+                    b;
+                    // $ExpectType [Error, any, never]
+                    c;
+                });
+                w.then(null, null, (a, b, c) => {
+                    // $ExpectType [number, any, never]
+                    a;
+                    // $ExpectType [number, any, never]
+                    b;
+                    // $ExpectType [number, any, never]
+                    c;
+                });
+            }
+
+            // 2 parameters
+            {
+                const w = $.when(t, u);
+
+                w.then((a, b) => {
+                    // $ExpectType [string, boolean, never]
+                    a;
+                    // $ExpectType [string, boolean, never]
+                    b;
+                });
+                w.catch((a, b) => {
+                    // $ExpectType [Error, any, never]
+                    a;
+                    // $ExpectType [Error, any, never]
+                    b;
+                });
+                w.then(null, null, (a, b) => {
+                    // $ExpectType [number, any, never]
+                    a;
+                    // $ExpectType [number, any, never]
+                    b;
+                });
+            }
+
+            // 1 parameter
+            {
+                const w = $.when(t);
+
+                w.then((a, b) => {
+                    // $ExpectType string
+                    a;
+                    // $ExpectType boolean
+                    b;
+                });
+                w.catch((a, b) => {
+                    // $ExpectType Error
+                    a;
+                    // $ExpectType any
+                    b;
+                });
+                w.then(null, null, (a, b) => {
+                    // $ExpectType number
+                    a;
+                    // $ExpectType any
+                    b;
+                });
+            }
+        }
+
+        // $ExpectType Promise<string, any, any>
+        $.when($.Deferred<string>());
+
+        // $ExpectType Promise<never, never, never>
         $.when();
 
         // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/2725

From 86def88082336825a641ad492add423234779af6 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 25 Jun 2017 15:54:08 -0400
Subject: [PATCH 030/287] [jquery] Fix Deferred and Promise.

---
 types/jquery/index.d.ts | 559 +++++++++++++++++++++++++++++++++-------
 1 file changed, 462 insertions(+), 97 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 2fc6a38f22..316e631b9d 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4267,7 +4267,71 @@ declare namespace JQuery {
      */
     interface Thenable<T> extends PromiseLike<T> { }
 
-    interface Deferred<TResolve, TReject = any, TNotify = any> extends Deferred.PromiseBase<TResolve, TReject, TNotify> {
+    interface Deferred<TR, TJ = any, TN = any> {
+        /**
+         * Add handlers to be called when the Deferred object is either resolved or rejected.
+         *
+         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
+         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+         * @see {@link https://api.jquery.com/deferred.always/}
+         * @since 1.6
+         */
+        always(alwaysCallback: TypeOrArray<Deferred.AlwaysCallback<TR, TJ>>,
+               ...alwaysCallbacks: Array<TypeOrArray<Deferred.AlwaysCallback<TR, TJ>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is resolved.
+         *
+         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
+         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.done/}
+         * @since 1.5
+         */
+        done(doneCallback: TypeOrArray<Deferred.DoneCallback<TR>>,
+             ...doneCallbacks: Array<TypeOrArray<Deferred.DoneCallback<TR>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
+         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.fail/}
+         * @since 1.5
+         */
+        fail(failCallback: TypeOrArray<Deferred.FailCallback<TJ>>,
+             ...failCallbacks: Array<TypeOrArray<Deferred.FailCallback<TJ>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object generates progress notifications.
+         *
+         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
+         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
+         *                          progress notifications.
+         * @see {@link https://api.jquery.com/deferred.progress/}
+         * @since 1.7
+         */
+        progress(progressCallback: TypeOrArray<Deferred.ProgressCallback<TN>>,
+                 ...progressCallbacks: Array<TypeOrArray<Deferred.ProgressCallback<TN>>>): this;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @param target Object onto which the promise methods have to be attached
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TR> & TTarget;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise(): JQuery.Promise<TR>;
+        /**
+         * Determine the current state of a Deferred object.
+         *
+         * @see {@link https://api.jquery.com/deferred.state/}
+         * @since 1.7
+         */
+        state(): 'pending' | 'resolved' | 'rejected';
+
         /**
          * Add handlers to be called when the Deferred object is rejected.
          *
@@ -4275,7 +4339,8 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.catch/}
          * @since 3.0
          */
-        catch<UResolve>(failFilter: (...reasons: TReject[]) => UResolve | Thenable<UResolve>): Deferred<UResolve, TReject, TNotify>;
+        catch<AR, AJ = never, AN = TN>(failFilter: (...reasons: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4287,11 +4352,93 @@ declare namespace JQuery {
          * @since 1.7
          * @deprecated 1.8
          */
-        pipe<UResolve = TResolve,
-            UReject = TReject,
-            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
-                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
-                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
+        pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>,
+             progressFilter: (...t: TN[]) => AN3 | Thenable<AN3> | JQuery.Promise<AR3, AJ3, AN3>): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR = TJ, AJ = TJ, AN = TN>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => AN | Thenable<AN> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR, AJ = never, AN = TN>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR, AJ = TJ, AN = TN>
+            (doneFilter: (...t: TR[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4301,11 +4448,80 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.then/}
          * @since 1.8
          */
-        then<UResolve = TResolve,
-            UReject = TReject,
-            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
-                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
-                               progressFilter?: ((...values: TNotify[]) => TNotify | Thenable<TNotify>) | null): Deferred<UResolve, UReject, UNotify>;
+        then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>,
+             progressFilter: (...t: TN[]) => AN3 | Thenable<AN3> | JQuery.Promise<AR3, AJ3, AN3>): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR = TJ, AJ = TJ, AN = TN>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => AN | Thenable<AN> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR, AJ = never, AN = TN>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR, AJ = TJ, AN = TN>
+            (doneFilter: (...t: TR[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
 
         /**
          * Call the progressCallbacks on a Deferred object with the given args.
@@ -4314,7 +4530,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.notify/}
          * @since 1.7
          */
-        notify(...args: TNotify[]): this;
+        notify(...args: TN[]): this;
         /**
          * Call the progressCallbacks on a Deferred object with the given context and args.
          *
@@ -4323,7 +4539,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.notifyWith/}
          * @since 1.7
          */
-        notifyWith(context: object, args?: ArrayLike<TNotify>): this;
+        notifyWith(context: object, args?: ArrayLike<TN>): this;
         /**
          * Reject a Deferred object and call any failCallbacks with the given args.
          *
@@ -4331,7 +4547,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.reject/}
          * @since 1.5
          */
-        reject(...args: TReject[]): this;
+        reject(...args: TJ[]): this;
         /**
          * Reject a Deferred object and call any failCallbacks with the given context and args.
          *
@@ -4340,7 +4556,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.rejectWith/}
          * @since 1.5
          */
-        rejectWith(context: object, args?: ArrayLike<TReject>): this;
+        rejectWith(context: object, args?: ArrayLike<TJ>): this;
         /**
          * Resolve a Deferred object and call any doneCallbacks with the given args.
          *
@@ -4348,7 +4564,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.resolve/}
          * @since 1.5
          */
-        resolve(...args: TResolve[]): this;
+        resolve(...args: TR[]): this;
         /**
          * Resolve a Deferred object and call any doneCallbacks with the given context and args.
          *
@@ -4357,7 +4573,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.resolveWith/}
          * @since 1.5
          */
-        resolveWith(context: object, args?: ArrayLike<TResolve>): this;
+        resolveWith(context: object, args?: ArrayLike<TR>): this;
     }
 
     namespace Deferred {
@@ -4392,73 +4608,6 @@ declare namespace JQuery {
          * @deprecated
          */
         interface ProgressCallback<TNotify> extends Callback<TNotify> { }
-
-        // Common interface for Deferred and Promise
-        interface PromiseBase<TResolve, TReject, TNotify> {
-            /**
-             * Add handlers to be called when the Deferred object is either resolved or rejected.
-             *
-             * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
-             * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-             * @see {@link https://api.jquery.com/deferred.always/}
-             * @since 1.6
-             */
-            always(alwaysCallback: TypeOrArray<Deferred.AlwaysCallback<TResolve, TReject>>,
-                   ...alwaysCallbacks: Array<TypeOrArray<Deferred.AlwaysCallback<TResolve, TReject>>>): this;
-            /**
-             * Add handlers to be called when the Deferred object is resolved.
-             *
-             * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
-             * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-             * @see {@link https://api.jquery.com/deferred.done/}
-             * @since 1.5
-             */
-            done(doneCallback: TypeOrArray<Deferred.DoneCallback<TResolve>>,
-                 ...doneCallbacks: Array<TypeOrArray<Deferred.DoneCallback<TResolve>>>): this;
-            /**
-             * Add handlers to be called when the Deferred object is rejected.
-             *
-             * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
-             * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-             * @see {@link https://api.jquery.com/deferred.fail/}
-             * @since 1.5
-             */
-            fail(failCallback: TypeOrArray<Deferred.FailCallback<TReject>>,
-                 ...failCallbacks: Array<TypeOrArray<Deferred.FailCallback<TReject>>>): this;
-            /**
-             * Add handlers to be called when the Deferred object generates progress notifications.
-             *
-             * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
-             * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
-             *                          progress notifications.
-             * @see {@link https://api.jquery.com/deferred.progress/}
-             * @since 1.7
-             */
-            progress(progressCallback: TypeOrArray<Deferred.ProgressCallback<TNotify>>,
-                     ...progressCallbacks: Array<TypeOrArray<Deferred.ProgressCallback<TNotify>>>): this;
-            /**
-             * Return a Deferred's Promise object.
-             *
-             * @param target Object onto which the promise methods have to be attached
-             * @see {@link https://api.jquery.com/deferred.promise/}
-             * @since 1.5
-             */
-            promise<TTarget extends object>(target: TTarget): JQuery.Promise<TResolve> & TTarget;
-            /**
-             * Return a Deferred's Promise object.
-             *
-             * @see {@link https://api.jquery.com/deferred.promise/}
-             * @since 1.5
-             */
-            promise(): JQuery.Promise<TResolve>;
-            /**
-             * Determine the current state of a Deferred object.
-             *
-             * @see {@link https://api.jquery.com/deferred.state/}
-             * @since 1.7
-             */
-            state(): 'pending' | 'resolved' | 'rejected';
-        }
     }
 
     /**
@@ -5067,7 +5216,71 @@ declare namespace JQuery {
      *
      * @see {@link http://api.jquery.com/Types/#Promise}
      */
-    interface Promise<TResolve, TReject = any, TNotify = any> extends Deferred.PromiseBase<TResolve, TReject, TNotify> {
+    interface Promise<TR, TJ = any, TN = any> {
+        /**
+         * Add handlers to be called when the Deferred object is either resolved or rejected.
+         *
+         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
+         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
+         * @see {@link https://api.jquery.com/deferred.always/}
+         * @since 1.6
+         */
+        always(alwaysCallback: TypeOrArray<Deferred.AlwaysCallback<TR, TJ>>,
+               ...alwaysCallbacks: Array<TypeOrArray<Deferred.AlwaysCallback<TR, TJ>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is resolved.
+         *
+         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
+         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.done/}
+         * @since 1.5
+         */
+        done(doneCallback: TypeOrArray<Deferred.DoneCallback<TR>>,
+             ...doneCallbacks: Array<TypeOrArray<Deferred.DoneCallback<TR>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object is rejected.
+         *
+         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
+         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.fail/}
+         * @since 1.5
+         */
+        fail(failCallback: TypeOrArray<Deferred.FailCallback<TJ>>,
+             ...failCallbacks: Array<TypeOrArray<Deferred.FailCallback<TJ>>>): this;
+        /**
+         * Add handlers to be called when the Deferred object generates progress notifications.
+         *
+         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
+         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
+         *                          progress notifications.
+         * @see {@link https://api.jquery.com/deferred.progress/}
+         * @since 1.7
+         */
+        progress(progressCallback: TypeOrArray<Deferred.ProgressCallback<TN>>,
+                 ...progressCallbacks: Array<TypeOrArray<Deferred.ProgressCallback<TN>>>): this;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @param target Object onto which the promise methods have to be attached
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TR> & TTarget;
+        /**
+         * Return a Deferred's Promise object.
+         *
+         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @since 1.5
+         */
+        promise(): JQuery.Promise<TR>;
+        /**
+         * Determine the current state of a Deferred object.
+         *
+         * @see {@link https://api.jquery.com/deferred.state/}
+         * @since 1.7
+         */
+        state(): 'pending' | 'resolved' | 'rejected';
+
         /**
          * Add handlers to be called when the Deferred object is rejected.
          *
@@ -5075,7 +5288,8 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.catch/}
          * @since 3.0
          */
-        catch<UReject = TReject>(failFilter: (...reasons: TReject[]) => UReject | Thenable<UReject>): Promise<TResolve, UReject, TNotify>;
+        catch<AR, AJ = never, AN = TN>(failFilter: (...reasons: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5087,11 +5301,93 @@ declare namespace JQuery {
          * @since 1.7
          * @deprecated 1.8
          */
-        pipe<UResolve = TResolve,
-            UReject = TReject,
-            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
-                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
-                               progressFilter?: ((...values: TNotify[]) => UNotify | Thenable<UNotify>) | null): Promise<UResolve, UReject, UNotify>;
+        pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>,
+             progressFilter: (...t: TN[]) => AN3 | Thenable<AN3> | JQuery.Promise<AR3, AJ3, AN3>): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR = TJ, AJ = TJ, AN = TN>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => AN | Thenable<AN> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR, AJ = never, AN = TN>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<AR, AJ = TJ, AN = TN>
+            (doneFilter: (...t: TR[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5101,11 +5397,80 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.then/}
          * @since 1.8
          */
-        then<UResolve = TResolve,
-            UReject = TReject,
-            UNotify = TNotify>(doneFilter: ((...values: TResolve[]) => UResolve | Thenable<UResolve>) | null,
-                               failFilter?: ((...reasons: TReject[]) => UReject | Thenable<UReject>) | null,
-                               progressFilter?: ((...values: TNotify[]) => UNotify | Thenable<UNotify>) | null): Promise<UResolve, UReject, UNotify>;
+        then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>,
+             progressFilter: (...t: TN[]) => AN3 | Thenable<AN3> | JQuery.Promise<AR3, AJ3, AN3>): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR = TJ, AJ = TJ, AN = TN>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => AN | Thenable<AN> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
+            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR, AJ = never, AN = TN>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<AR, AJ = TJ, AN = TN>
+            (doneFilter: (...t: TR[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
     }
 
     // endregion

From ed48fab28e2f91d244fbc2b1fa3034fe5a54fa02 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Sun, 25 Jun 2017 23:03:34 +0200
Subject: [PATCH 031/287] Updated existing activex definitions

---
 .../activex-adodb-tests.ts}                   |  12 +
 .../index.d.ts                                | 433 +++++++----
 types/activex-adodb/package.json              |   1 +
 .../tsconfig.json                             |  13 +-
 types/activex-adodb/tslint.json               |   1 +
 types/activex-scripting-runtime/index.d.ts    | 205 ------
 .../activex-scripting-tests.ts                |  64 ++
 .../activex-scripting.ts}                     |   0
 types/activex-scripting/index.d.ts            | 513 +++++++++++++
 types/activex-scripting/package.json          |   1 +
 .../tsconfig.json                             |  13 +-
 types/activex-scripting/tslint.json           |   1 +
 .../activex-wia-tests.ts}                     |   6 +-
 types/activex-wia/index.d.ts                  | 697 ++++++++++++++++++
 types/activex-wia/package.json                |   1 +
 .../tsconfig.json                             |  13 +-
 types/activex-wia/tslint.json                 |   1 +
 .../index.d.ts                                | 379 ----------
 18 files changed, 1598 insertions(+), 756 deletions(-)
 rename types/{activex-data-objects/activex-data-objects-tests.ts => activex-adodb/activex-adodb-tests.ts} (69%)
 rename types/{activex-data-objects => activex-adodb}/index.d.ts (52%)
 create mode 100644 types/activex-adodb/package.json
 rename types/{activex-data-objects => activex-adodb}/tsconfig.json (55%)
 create mode 100644 types/activex-adodb/tslint.json
 delete mode 100644 types/activex-scripting-runtime/index.d.ts
 create mode 100644 types/activex-scripting/activex-scripting-tests.ts
 rename types/{activex-scripting-runtime/activex-scripting-runtime-tests.ts => activex-scripting/activex-scripting.ts} (100%)
 create mode 100644 types/activex-scripting/index.d.ts
 create mode 100644 types/activex-scripting/package.json
 rename types/{activex-scripting-runtime => activex-scripting}/tsconfig.json (54%)
 create mode 100644 types/activex-scripting/tslint.json
 rename types/{activex-windows-image-acquisition/activex-windows-image-acquisition-tests.ts => activex-wia/activex-wia-tests.ts} (95%)
 create mode 100644 types/activex-wia/index.d.ts
 create mode 100644 types/activex-wia/package.json
 rename types/{activex-windows-image-acquisition => activex-wia}/tsconfig.json (53%)
 create mode 100644 types/activex-wia/tslint.json
 delete mode 100644 types/activex-windows-image-acquisition/index.d.ts

diff --git a/types/activex-data-objects/activex-data-objects-tests.ts b/types/activex-adodb/activex-adodb-tests.ts
similarity index 69%
rename from types/activex-data-objects/activex-data-objects-tests.ts
rename to types/activex-adodb/activex-adodb-tests.ts
index 6298298a48..341bf83108 100644
--- a/types/activex-data-objects/activex-data-objects-tests.ts
+++ b/types/activex-adodb/activex-adodb-tests.ts
@@ -1,3 +1,15 @@
+let obj0 = new ActiveXObject('ADODB.Command');
+
+let obj1 = new ActiveXObject('ADODB.Connection');
+
+let obj2 = new ActiveXObject('ADODB.Parameter');
+
+let obj3 = new ActiveXObject('ADODB.Record');
+
+let obj4 = new ActiveXObject('ADODB.Recordset');
+
+let obj5 = new ActiveXObject('ADODB.Stream');
+
 //open connection to an Excel file
 var pathToExcelFile = 'C:\\path\\to\\excel\\file.xlsx';
 var conn = new ActiveXObject('ADODB.Connection');
diff --git a/types/activex-data-objects/index.d.ts b/types/activex-adodb/index.d.ts
similarity index 52%
rename from types/activex-data-objects/index.d.ts
rename to types/activex-adodb/index.d.ts
index d3ccf7a6c7..8d6190363a 100644
--- a/types/activex-data-objects/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,8 +1,7 @@
-// Type definitions for Microsoft ActiveX Data Objects
-// Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms675532(v=vs.85).aspx
-// Definitions by: Zev Spitz <https://github.com/zspitz>
+// Type definitions for ADODB - 
+// Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
+// Defintions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 declare namespace ADODB {
 
     //Enums
@@ -598,237 +597,391 @@ declare namespace ADODB {
     //Interfaces
     interface Command {
         ActiveConnection: Connection;
-        Cancel: () => void;
-        CommandStream: any /*VT_UNKNOWN*/;
+        Cancel(): void;
+        CommandStream: any;
         CommandText: string;
         CommandTimeout: number;
         CommandType: CommandTypeEnum;
-        CreateParameter: (Name?: string, Type?: DataTypeEnum, Direction?: ParameterDirectionEnum, Size?: number, Value?: any) => Parameter;
+        
+        /**
+        * @param string [Name='']
+        * @param ADODB.DataTypeEnum [Type=0]
+        * @param ADODB.ParameterDirectionEnum [Direction=1]
+        * @param number [Size=0]
+        */
+        CreateParameter(Name?: string, Type?: DataTypeEnum, Direction?: ParameterDirectionEnum, Size?: number, Value?: any): Parameter;
         Dialect: string;
-        Execute: (RecordsAffected?: any, Parameters?: any, Options?: number) => Recordset;
+        
+        /** @param number [Options=-1] */
+        Execute(RecordsAffected?: any, Parameters?: any[], Options?: number): Recordset;
         Name: string;
         NamedParameters: boolean;
-        Parameters: Parameters;
+        readonly Parameters: Parameters;
         Prepared: boolean;
-        Properties: Properties;
-        State: number;
+        readonly Properties: Properties;
+        readonly State: number;
     }
 
     interface Connection {
         Attributes: number;
-        BeginTrans: () => number;
-        Cancel: () => void;
-        Close: () => void;
+        BeginTrans(): number;
+        Cancel(): void;
+        Close(): void;
         CommandTimeout: number;
-        CommitTrans: () => void;
+        CommitTrans(): void;
         ConnectionString: string;
         ConnectionTimeout: number;
         CursorLocation: CursorLocationEnum;
         DefaultDatabase: string;
-        Errors: Errors;
-        Execute: (CommandText: string, RecordsAffected: any, Options?: number) => Recordset;
+        readonly Errors: Errors;
+        
+        /** @param number [Options=-1] */
+        Execute(CommandText: string, RecordsAffected: any, Options?: number): Recordset;
         IsolationLevel: IsolationLevelEnum;
         Mode: ConnectModeEnum;
-        Open: (ConnectionString?: string, UserID?: string, Password?: string, Options?: number) => void;
-        OpenSchema: (Schema: SchemaEnum, Restrictions?: any, SchemaID?: any) => Recordset;
-        Properties: Properties;
+        
+        /**
+        * @param string [ConnectionString='']
+        * @param string [UserID='']
+        * @param string [Password='']
+        * @param number [Options=-1]
+        */
+        Open(ConnectionString?: string, UserID?: string, Password?: string, Options?: number): void;
+        OpenSchema(Schema: SchemaEnum, Restrictions?: any, SchemaID?: any): Recordset;
+        readonly Properties: Properties;
         Provider: string;
-        RollbackTrans: () => void;
-        State: number;
-        Version: string;
+        RollbackTrans(): void;
+        readonly State: number;
+        readonly Version: string;
     }
 
     interface Error {
-        Description: string;
-        HelpContext: number;
-        HelpFile: string;
-        NativeError: number;
-        Number: number;
-        Source: string;
-        SQLState: string;
+        readonly Description: string;
+        readonly HelpContext: number;
+        readonly HelpFile: string;
+        readonly NativeError: number;
+        readonly Number: number;
+        readonly Source: string;
+        readonly SQLState: string;
     }
 
     interface Errors {
-        Clear: () => void;
-        Count: number;
-        Item: (Index: any) => Error;
-        Refresh: () => void;
+        Clear(): void;
+        readonly Count: number;
+        Item(Index: any): Error;
+        Refresh(): void;
     }
 
     interface Field {
-        ActualSize: number;
-        AppendChunk: (Data: any) => void;
+        readonly ActualSize: number;
+        AppendChunk(Data: any): void;
         Attributes: number;
-        DataFormat: any /*VT_UNKNOWN*/;
+        DataFormat: any;
         DefinedSize: number;
-        GetChunk: (Length: number) => any;
-        Name: string;
+        GetChunk(Length: number): any;
+        readonly Name: string;
         NumericScale: number;
-        OriginalValue: any;
+        readonly OriginalValue: any;
         Precision: number;
-        Properties: Properties;
-        Status: number;
+        readonly Properties: Properties;
+        readonly Status: number;
         Type: DataTypeEnum;
-        UnderlyingValue: any;
+        readonly UnderlyingValue: any;
         Value: any;
     }
 
     interface Fields {
-        _Append: (Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum) => void;
-        Append: (Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum, FieldValue?: any) => void;
-        CancelUpdate: () => void;
-        Count: number;
-        Delete: (Index: any) => void;
-        Item: (Index: any) => Field;
-        Refresh: () => void;
-        Resync: (ResyncValues?: ResyncEnum) => void;
-        Update: () => void;
+        
+        /**
+        * @param number [DefinedSize=0]
+        * @param ADODB.FieldAttributeEnum [Attrib=-1]
+        */
+        _Append(Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum): void;
+        
+        /**
+        * @param number [DefinedSize=0]
+        * @param ADODB.FieldAttributeEnum [Attrib=-1]
+        */
+        Append(Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum, FieldValue?: any): void;
+        CancelUpdate(): void;
+        readonly Count: number;
+        Delete(Index: any): void;
+        Item(Index: any): Field;
+        Refresh(): void;
+        
+        /** @param ADODB.ResyncEnum [ResyncValues=2] */
+        Resync(ResyncValues?: ResyncEnum): void;
+        Update(): void;
     }
 
     interface Parameter {
-        AppendChunk: (Val: any) => void;
+        AppendChunk(Val: any): void;
         Attributes: number;
         Direction: ParameterDirectionEnum;
         Name: string;
         NumericScale: number;
         Precision: number;
-        Properties: Properties;
+        readonly Properties: Properties;
         Size: number;
         Type: DataTypeEnum;
         Value: any;
     }
 
     interface Parameters {
-        Append: (Object: any /*VT_DISPATCH*/) => void;
-        Count: number;
-        Delete: (Index: any) => void;
-        Item: (Index: any) => Parameter;
-        Refresh: () => void;
+        Append(Object: any): void;
+        readonly Count: number;
+        Delete(Index: any): void;
+        Item(Index: any): Parameter;
+        Refresh(): void;
     }
 
     interface Properties {
-        Count: number;
-        Item: (Index: any) => Property;
-        Refresh: () => void;
+        readonly Count: number;
+        Item(Index: any): Property;
+        Refresh(): void;
     }
 
     interface Property {
         Attributes: number;
-        Name: string;
-        Type: DataTypeEnum;
+        readonly Name: string;
+        readonly Type: DataTypeEnum;
         Value: any;
     }
 
     interface Record {
         ActiveConnection: any;
-        Cancel: () => void;
-        Close: () => void;
-        CopyRecord: (Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: CopyRecordOptionsEnum, Async?: boolean) => string;
-        DeleteRecord: (Source?: string, Async?: boolean) => void;
-        Fields: Fields;
-        GetChildren: () => Recordset;
+        Cancel(): void;
+        Close(): void;
+        
+        /**
+        * @param string [Source='']
+        * @param string [Destination='']
+        * @param string [UserName='']
+        * @param string [Password='']
+        * @param ADODB.CopyRecordOptionsEnum [Options=-1]
+        * @param boolean [Async=false]
+        */
+        CopyRecord(Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: CopyRecordOptionsEnum, Async?: boolean): string;
+        
+        /**
+        * @param string [Source='']
+        * @param boolean [Async=false]
+        */
+        DeleteRecord(Source?: string, Async?: boolean): void;
+        readonly Fields: Fields;
+        GetChildren(): Recordset;
         Mode: ConnectModeEnum;
-        MoveRecord: (Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: MoveRecordOptionsEnum, Async?: boolean) => string;
-        Open: (Source: any, ActiveConnection: any, Mode?: ConnectModeEnum, CreateOptions?: RecordCreateOptionsEnum, Options?: RecordOpenOptionsEnum, UserName?: string, Password?: string) => void;
-        ParentURL: string;
-        Properties: Properties;
-        RecordType: RecordTypeEnum;
+        
+        /**
+        * @param string [Source='']
+        * @param string [Destination='']
+        * @param string [UserName='']
+        * @param string [Password='']
+        * @param ADODB.MoveRecordOptionsEnum [Options=-1]
+        * @param boolean [Async=false]
+        */
+        MoveRecord(Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: MoveRecordOptionsEnum, Async?: boolean): string;
+        
+        /**
+        * @param ADODB.ConnectModeEnum [Mode=0]
+        * @param ADODB.RecordCreateOptionsEnum [CreateOptions=-1]
+        * @param ADODB.RecordOpenOptionsEnum [Options=-1]
+        * @param string [UserName='']
+        * @param string [Password='']
+        */
+        Open(Source: any, ActiveConnection: any, Mode?: ConnectModeEnum, CreateOptions?: RecordCreateOptionsEnum, Options?: RecordOpenOptionsEnum, UserName?: string, Password?: string): void;
+        readonly ParentURL: string;
+        readonly Properties: Properties;
+        readonly RecordType: RecordTypeEnum;
         Source: any;
-        State: ObjectStateEnum;
+        readonly State: ObjectStateEnum;
     }
 
     interface Recordset {
-        _xClone: () => Recordset;
-        _xResync: (AffectRecords?: AffectEnum) => void;
-        _xSave: (FileName?: string, PersistFormat?: PersistFormatEnum) => void;
+        _xClone(): Recordset;
+        
+        /** @param ADODB.AffectEnum [AffectRecords=3] */
+        _xResync(AffectRecords?: AffectEnum): void;
+        
+        /**
+        * @param string [FileName='']
+        * @param ADODB.PersistFormatEnum [PersistFormat=0]
+        */
+        _xSave(FileName?: string, PersistFormat?: PersistFormatEnum): void;
         AbsolutePage: PositionEnum;
         AbsolutePosition: PositionEnum;
-        ActiveCommand: any /*VT_DISPATCH*/;
-        ActiveConnection: any /*VT_DISPATCH*/;
-        AddNew: (FieldList?: any, Values?: any) => void;
-        BOF: boolean;
+        readonly ActiveCommand: any;
+        ActiveConnection: any;
+        AddNew(FieldList?: any, Values?: any): void;
+        readonly BOF: boolean;
         Bookmark: any;
         CacheSize: number;
-        Cancel: () => void;
-        CancelBatch: (AffectRecords?: AffectEnum) => void;
-        CancelUpdate: () => void;
-        Clone: (LockType?: LockTypeEnum) => Recordset;
-        Close: () => void;
-        Collect: (Index: any) => any;   //Also has setter with parameters
-        CompareBookmarks: (Bookmark1: any, Bookmark2: any) => CompareEnum;
+        Cancel(): void;
+        
+        /** @param ADODB.AffectEnum [AffectRecords=3] */
+        CancelBatch(AffectRecords?: AffectEnum): void;
+        CancelUpdate(): void;
+        
+        /** @param ADODB.LockTypeEnum [LockType=-1] */
+        Clone(LockType?: LockTypeEnum): Recordset;
+        Close(): void;
+        Collect(Index: any): any;
+        CompareBookmarks(Bookmark1: any, Bookmark2: any): CompareEnum;
         CursorLocation: CursorLocationEnum;
         CursorType: CursorTypeEnum;
         DataMember: string;
-        DataSource: any /*VT_UNKNOWN*/;
-        Delete: (AffectRecords?: AffectEnum) => void;
-        EditMode: EditModeEnum;
-        EOF: boolean;
-        Fields: Fields;
+        DataSource: any;
+        
+        /** @param ADODB.AffectEnum [AffectRecords=1] */
+        Delete(AffectRecords?: AffectEnum): void;
+        readonly EditMode: EditModeEnum;
+        readonly EOF: boolean;
+        readonly Fields: Fields;
         Filter: any;
-        Find: (Criteria: string, SkipRecords?: number, SearchDirection?: SearchDirectionEnum, Start?: any) => void;
-        GetRows: (Rows?: number, Start?: any, Fields?: any) => any;
-        GetString: (StringFormat?: StringFormatEnum, NumRows?: number, ColumnDelimeter?: string, RowDelimeter?: string, NullExpr?: string) => string;
+        
+        /**
+        * @param number [SkipRecords=0]
+        * @param ADODB.SearchDirectionEnum [SearchDirection=1]
+        */
+        Find(Criteria: string, SkipRecords?: number, SearchDirection?: SearchDirectionEnum, Start?: any): void;
+        
+        /** @param number [Rows=-1] */
+        GetRows(Rows?: number, Start?: any, Fields?: any): any;
+        
+        /**
+        * @param ADODB.StringFormatEnum [StringFormat=2]
+        * @param number [NumRows=-1]
+        * @param string [ColumnDelimeter='']
+        * @param string [RowDelimeter='']
+        * @param string [NullExpr='']
+        */
+        GetString(StringFormat?: StringFormatEnum, NumRows?: number, ColumnDelimeter?: string, RowDelimeter?: string, NullExpr?: string): string;
         Index: string;
         LockType: LockTypeEnum;
         MarshalOptions: MarshalOptionsEnum;
         MaxRecords: number;
-        Move: (NumRecords: number, Start?: any) => void;
-        MoveFirst: () => void;
-        MoveLast: () => void;
-        MoveNext: () => void;
-        MovePrevious: () => void;
-        NextRecordset: (RecordsAffected?: any) => Recordset;
-        Open: (Source: any, ActiveConnection: any, CursorType?: CursorTypeEnum, LockType?: LockTypeEnum, Options?: number) => void;
-        PageCount: number;
+        Move(NumRecords: number, Start?: any): void;
+        MoveFirst(): void;
+        MoveLast(): void;
+        MoveNext(): void;
+        MovePrevious(): void;
+        NextRecordset(RecordsAffected?: any): Recordset;
+        
+        /**
+        * @param ADODB.CursorTypeEnum [CursorType=-1]
+        * @param ADODB.LockTypeEnum [LockType=-1]
+        * @param number [Options=-1]
+        */
+        Open(Source: any, ActiveConnection: any, CursorType?: CursorTypeEnum, LockType?: LockTypeEnum, Options?: number): void;
+        readonly PageCount: number;
         PageSize: number;
-        Properties: Properties;
-        RecordCount: number;
-        Requery: (Options?: number) => void;
-        Resync: (AffectRecords?: AffectEnum, ResyncValues?: ResyncEnum) => void;
-        Save: (Destination: any, PersistFormat?: PersistFormatEnum) => void;
-        Seek: (KeyValues: any, SeekOption?: SeekEnum) => void;
+        readonly Properties: Properties;
+        readonly RecordCount: number;
+        
+        /** @param number [Options=-1] */
+        Requery(Options?: number): void;
+        
+        /**
+        * @param ADODB.AffectEnum [AffectRecords=3]
+        * @param ADODB.ResyncEnum [ResyncValues=2]
+        */
+        Resync(AffectRecords?: AffectEnum, ResyncValues?: ResyncEnum): void;
+        
+        /** @param ADODB.PersistFormatEnum [PersistFormat=0] */
+        Save(Destination: any, PersistFormat?: PersistFormatEnum): void;
+        
+        /** @param ADODB.SeekEnum [SeekOption=1] */
+        Seek(KeyValues: any, SeekOption?: SeekEnum): void;
         Sort: string;
-        Source: any /*VT_DISPATCH*/;
-        State: number;
-        Status: number;
+        Source: any;
+        readonly State: number;
+        readonly Status: number;
         StayInSync: boolean;
-        Supports: (CursorOptions: CursorOptionEnum) => boolean;
-        Update: (Fields?: any, Values?: any) => void;
-        UpdateBatch: (AffectRecords?: AffectEnum) => void;
+        Supports(CursorOptions: CursorOptionEnum): boolean;
+        Update(Fields?: any, Values?: any): void;
+        
+        /** @param ADODB.AffectEnum [AffectRecords=3] */
+        UpdateBatch(AffectRecords?: AffectEnum): void;
     }
 
     interface Stream {
-        Cancel: () => void;
+        Cancel(): void;
         Charset: string;
-        Close: () => void;
-        CopyTo: (DestStream: Stream, CharNumber?: number) => void;
-        EOS: boolean;
-        Flush: () => void;
+        Close(): void;
+        
+        /** @param number [CharNumber=-1] */
+        CopyTo(DestStream: Stream, CharNumber?: number): void;
+        readonly EOS: boolean;
+        Flush(): void;
         LineSeparator: LineSeparatorEnum;
-        LoadFromFile: (FileName: string) => void;
+        LoadFromFile(FileName: string): void;
         Mode: ConnectModeEnum;
-        Open: (Source: any, Mode?: ConnectModeEnum, Options?: StreamOpenOptionsEnum, UserName?: string, Password?: string) => void;
+        
+        /**
+        * @param ADODB.ConnectModeEnum [Mode=0]
+        * @param ADODB.StreamOpenOptionsEnum [Options=-1]
+        * @param string [UserName='']
+        * @param string [Password='']
+        */
+        Open(Source: any, Mode?: ConnectModeEnum, Options?: StreamOpenOptionsEnum, UserName?: string, Password?: string): void;
         Position: number;
-        Read: (NumBytes?: number) => any;
-        ReadText: (NumChars?: number) => string;
-        SaveToFile: (FileName: string, Options?: SaveOptionsEnum) => void;
-        SetEOS: () => void;
-        Size: number;
-        SkipLine: () => void;
-        State: ObjectStateEnum;
+        
+        /** @param number [NumBytes=-1] */
+        Read(NumBytes?: number): any;
+        
+        /** @param number [NumChars=-1] */
+        ReadText(NumChars?: number): string;
+        
+        /** @param ADODB.SaveOptionsEnum [Options=1] */
+        SaveToFile(FileName: string, Options?: SaveOptionsEnum): void;
+        SetEOS(): void;
+        readonly Size: number;
+        SkipLine(): void;
+        readonly State: ObjectStateEnum;
         Type: StreamTypeEnum;
-        Write: (Buffer: any) => void;
-        WriteText: (Data: string, Options?: StreamWriteEnum) => void;
+        Write(Buffer: any): void;
+        
+        /** @param ADODB.StreamWriteEnum [Options=0] */
+        WriteText(Data: string, Options?: StreamWriteEnum): void;
     }
 
 }
 
+//Global interfaces
 interface ActiveXObject {
-    new (progID: 'ADODB.Connection'): ADODB.Connection;
-    new (progID: 'ADODB.Record'): ADODB.Record;
-    new (progID: 'ADODB.Stream'): ADODB.Stream;
-    new (progID: 'ADODB.Command'): ADODB.Command;
-    new (progID: 'ADODB.Recordset'): ADODB.Recordset;
-    new (progID: 'ADODB.Parameter'): ADODB.Parameter;
+    on(obj: ADODB.Connection, eventName: 'BeginTransComplete', eventArgs: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {TransactionLevel: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, eventName: 'CommitTransComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, eventName: 'ConnectComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, eventName: 'Disconnect', eventArgs: ['adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, eventName: 'ExecuteComplete', eventArgs: ['RecordsAffected', 'pError', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'], handler: (this: ADODB.Connection, parameter: {RecordsAffected: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, eventName: 'InfoMessage', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, eventName: 'RollbackTransComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, eventName: 'WillConnect', eventArgs: ['ConnectionString', 'UserID', 'Password', 'Options', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {ConnectionString: string, UserID: string, Password: string, Options: number, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, eventName: 'WillExecute', eventArgs: ['Source', 'CursorType', 'LockType', 'Options', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'], handler: (this: ADODB.Connection, parameter: {Source: string, CursorType: ADODB.CursorTypeEnum, LockType: ADODB.LockTypeEnum, Options: number, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'EndOfRecordset', eventArgs: ['fMoreData', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {fMoreData: boolean, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'FetchComplete', eventArgs: ['pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'FetchProgress', eventArgs: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {Progress: number, MaxProgress: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'FieldChangeComplete', eventArgs: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number, Fields: any, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'MoveComplete', eventArgs: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'RecordChangeComplete', eventArgs: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, cRecords: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'RecordsetChangeComplete', eventArgs: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'WillChangeField', eventArgs: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number, Fields: any, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'WillChangeRecord', eventArgs: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, cRecords: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'WillChangeRecordset', eventArgs: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, eventName: 'WillMove', eventArgs: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    set(obj: ADODB.Recordset, propertyName: 'Collect', parameterTypes: [any], newValue: any): void;
+    new(progid: 'ADODB.Command'): ADODB.Command;
+    new(progid: 'ADODB.Connection'): ADODB.Connection;
+    new(progid: 'ADODB.Parameter'): ADODB.Parameter;
+    new(progid: 'ADODB.Record'): ADODB.Record;
+    new(progid: 'ADODB.Recordset'): ADODB.Recordset;
+    new(progid: 'ADODB.Stream'): ADODB.Stream;
+}
+
+interface EnumeratorConstructor {
+    new(col: ADODB.Errors): ADODB.Error;
+    new(col: ADODB.Fields): ADODB.Field;
+    new(col: ADODB.Parameters): ADODB.Parameter;
+    new(col: ADODB.Properties): ADODB.Property;
 }
 
diff --git a/types/activex-adodb/package.json b/types/activex-adodb/package.json
new file mode 100644
index 0000000000..d798f99261
--- /dev/null
+++ b/types/activex-adodb/package.json
@@ -0,0 +1 @@
+{ "dependencies": { "activex-helpers": "*"}}
\ No newline at end of file
diff --git a/types/activex-data-objects/tsconfig.json b/types/activex-adodb/tsconfig.json
similarity index 55%
rename from types/activex-data-objects/tsconfig.json
rename to types/activex-adodb/tsconfig.json
index aa81742f09..22b6f9e045 100644
--- a/types/activex-data-objects/tsconfig.json
+++ b/types/activex-adodb/tsconfig.json
@@ -1,14 +1,9 @@
+
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom",
-            "scripthost"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
+        "lib": ["scripthost"],
+        "strict": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "activex-data-objects-tests.ts"
+        "activex-adodb-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/activex-adodb/tslint.json b/types/activex-adodb/tslint.json
new file mode 100644
index 0000000000..1d0e17119e
--- /dev/null
+++ b/types/activex-adodb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint / dt.json" }
\ No newline at end of file
diff --git a/types/activex-scripting-runtime/index.d.ts b/types/activex-scripting-runtime/index.d.ts
deleted file mode 100644
index 54065e1bd7..0000000000
--- a/types/activex-scripting-runtime/index.d.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-// Type definitions for Microsoft Scripting Runtime
-// Project: https://msdn.microsoft.com/en-us/library/bstcxhf7.aspx
-// Definitions by: Zev Spitz <https://github.com/zspitz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Scripting {
-
-    //Enums
-    const enum CompareMethod {
-        BinaryCompare = 0,
-        DatabaseCompare = 2,
-        TextCompare = 1
-    }
-
-    const enum DriveTypeConst {
-        CDRom = 4,
-        Fixed = 2,
-        RamDisk = 5,
-        Remote = 3,
-        Removable = 1,
-        UnknownType = 0
-    }
-
-    const enum FileAttribute {
-        Alias = 1024,
-        Archive = 32,
-        Compressed = 2048,
-        Directory = 16,
-        Hidden = 2,
-        Normal = 0,
-        ReadOnly = 1,
-        System = 4,
-        Volume = 8
-    }
-
-    const enum IOMode {
-        ForAppending = 8,
-        ForReading = 1,
-        ForWriting = 2
-    }
-
-    const enum SpecialFolderConst {
-        SystemFolder = 1,
-        TemporaryFolder = 2,
-        WindowsFolder = 0
-    }
-
-    const enum StandardStreamTypes {
-        StdErr = 2,
-        StdIn = 0,
-        StdOut = 1
-    }
-
-    const enum Tristate {
-        TristateFalse = 0,
-        TristateMixed = -2,
-        TristateTrue = -1,
-        TristateUseDefault = -2
-    }
-
-    //Interfaces
-    interface Dictionary {
-        Add: (Key: any, Item: any) => void;
-        CompareMode: CompareMethod;
-        Count: number;
-        Exists: (Key: any) => boolean;
-        HashVal: (Key: any) => any;
-        Item: (Key: any) => any;   //Also has setter with parameters
-        Items: () => any;
-        Key: (Key: any) => any;
-        Keys: () => any;
-        Remove: (Key: any) => void;
-        RemoveAll: () => void;
-    }
-
-    interface Drive {
-        AvailableSpace: any;
-        DriveLetter: string;
-        DriveType: DriveTypeConst;
-        FileSystem: string;
-        FreeSpace: any;
-        IsReady: boolean;
-        Path: string;
-        RootFolder: Folder;
-        SerialNumber: number;
-        ShareName: string;
-        TotalSize: any;
-        VolumeName: string;
-    }
-
-    interface Drives {
-        Count: number;
-        Item: (Key: any) => Drive;
-    }
-
-    interface Encoder {
-        EncodeScriptFile: (szExt: string, bstrStreamIn: string, cFlags: number, bstrDefaultLang: string) => string;
-    }
-
-    interface File {
-        Attributes: FileAttribute;
-        Copy: (Destination: string, OverWriteFiles?: boolean) => void;
-        DateCreated: VarDate;
-        DateLastAccessed: VarDate;
-        DateLastModified: VarDate;
-        Delete: (Force?: boolean) => void;
-        Drive: Drive;
-        Move: (Destination: string) => void;
-        Name: string;
-        OpenAsTextStream: (IOMode?: IOMode, Format?: Tristate) => TextStream;
-        ParentFolder: Folder;
-        Path: string;
-        ShortName: string;
-        ShortPath: string;
-        Size: any;
-        Type: string;
-    }
-
-    interface Files {
-        Count: number;
-        Item: (Key: any) => File;
-    }
-
-    interface FileSystemObject {
-        BuildPath: (Path: string, Name: string) => string;
-        CopyFile: (Source: string, Destination: string, OverWriteFiles?: boolean) => void;
-        CopyFolder: (Source: string, Destination: string, OverWriteFiles?: boolean) => void;
-        CreateFolder: (Path: string) => Folder;
-        CreateTextFile: (FileName: string, Overwrite?: boolean, Unicode?: boolean) => TextStream;
-        DeleteFile: (FileSpec: string, Force?: boolean) => void;
-        DeleteFolder: (FolderSpec: string, Force?: boolean) => void;
-        DriveExists: (DriveSpec: string) => boolean;
-        Drives: Drives;
-        FileExists: (FileSpec: string) => boolean;
-        FolderExists: (FolderSpec: string) => boolean;
-        GetAbsolutePathName: (Path: string) => string;
-        GetBaseName: (Path: string) => string;
-        GetDrive: (DriveSpec: string) => Drive;
-        GetDriveName: (Path: string) => string;
-        GetExtensionName: (Path: string) => string;
-        GetFile: (FilePath: string) => File;
-        GetFileName: (Path: string) => string;
-        GetFileVersion: (FileName: string) => string;
-        GetFolder: (FolderPath: string) => Folder;
-        GetParentFolderName: (Path: string) => string;
-        GetSpecialFolder: (SpecialFolder: SpecialFolderConst) => Folder;
-        GetStandardStream: (StandardStreamType: StandardStreamTypes, Unicode?: boolean) => TextStream;
-        GetTempName: () => string;
-        MoveFile: (Source: string, Destination: string) => void;
-        MoveFolder: (Source: string, Destination: string) => void;
-        OpenTextFile: (FileName: string, IOMode?: IOMode, Create?: boolean, Format?: Tristate) => TextStream;
-    }
-
-    interface Folder {
-        Attributes: FileAttribute;
-        Copy: (Destination: string, OverWriteFiles?: boolean) => void;
-        CreateTextFile: (FileName: string, Overwrite?: boolean, Unicode?: boolean) => TextStream;
-        DateCreated: VarDate;
-        DateLastAccessed: VarDate;
-        DateLastModified: VarDate;
-        Delete: (Force?: boolean) => void;
-        Drive: Drive;
-        Files: Files;
-        IsRootFolder: boolean;
-        Move: (Destination: string) => void;
-        Name: string;
-        ParentFolder: Folder;
-        Path: string;
-        ShortName: string;
-        ShortPath: string;
-        Size: any;
-        SubFolders: Folders;
-        Type: string;
-    }
-
-    interface Folders {
-        Add: (Name: string) => Folder;
-        Count: number;
-        Item: (Key: any) => Folder;
-    }
-
-    interface TextStream {
-        AtEndOfLine: boolean;
-        AtEndOfStream: boolean;
-        Close: () => void;
-        Column: number;
-        Line: number;
-        Read: (Characters: number) => string;
-        ReadAll: () => string;
-        ReadLine: () => string;
-        Skip: (Characters: number) => void;
-        SkipLine: () => void;
-        Write: (Text: string) => void;
-        WriteBlankLines: (Lines: number) => void;
-        WriteLine: (Text?: string) => void;
-    }
-
-}
-
-interface ActiveXObject {
-    new (progID: 'Scripting.Dictionary'): Scripting.Dictionary;
-    new (progID: 'Scripting.FileSystemObject'): Scripting.FileSystemObject;
-    new (progID: 'Scripting.Encoder'): Scripting.Encoder;
-}
-
diff --git a/types/activex-scripting/activex-scripting-tests.ts b/types/activex-scripting/activex-scripting-tests.ts
new file mode 100644
index 0000000000..6b460f6347
--- /dev/null
+++ b/types/activex-scripting/activex-scripting-tests.ts
@@ -0,0 +1,64 @@
+//source -- https://msdn.microsoft.com/en-us/library/ebkhfaaz.aspx
+
+
+//Generates a string describing the drive type of a given Drive object.
+var showDriveType = (drive: Scripting.Drive) => {
+    switch (drive.DriveType) {
+        case Scripting.DriveTypeConst.Removable:
+            return 'Removeable';
+        case Scripting.DriveTypeConst.Fixed:
+            return 'Fixecd';
+        case Scripting.DriveTypeConst.Remote:
+            return 'Network';
+        case Scripting.DriveTypeConst.CDRom:
+            return 'CD-ROM';
+        case Scripting.DriveTypeConst.RamDisk:
+            return 'RAM Disk';
+        default:
+            return 'Unknown';
+    }
+};
+
+
+//Generates a string describing the attributes of a file or folder.
+var showFileAttributes = (file: Scripting.File) => {
+    var attr = file.Attributes;
+    if (attr === 0) {
+        return 'Normal';
+    }
+    var attributeStrings: string[] = [];
+    if (attr & Scripting.FileAttribute.Directory) { attributeStrings.push('Directory'); }
+    if (attr & Scripting.FileAttribute.ReadOnly) { attributeStrings.push('Read-only'); }
+    if (attr & Scripting.FileAttribute.Hidden) { attributeStrings.push('Hidden'); }
+    if (attr & Scripting.FileAttribute.System) { attributeStrings.push('System'); }
+    if (attr & Scripting.FileAttribute.Volume) { attributeStrings.push('Volume'); }
+    if (attr & Scripting.FileAttribute.Archive) { attributeStrings.push('Archive'); }
+    if (attr & Scripting.FileAttribute.Alias) { attributeStrings.push('Alias'); }
+    if (attr & Scripting.FileAttribute.Compressed) { attributeStrings.push('Compressed'); }
+    return attributeStrings.join(',');
+};
+
+
+//source --https://msdn.microsoft.com/en-us/library/ts2t8ybh(v=vs.84).aspx
+var showFreeSpace = (drvPath: string) => {
+    var fso = new ActiveXObject('Scripting.FileSystemObject');
+    var d = fso.GetDrive(fso.GetDriveName(drvPath));
+    var s = 'Drive ' + drvPath + ' - ';
+    s += d.VolumeName + '<br>';
+    s += 'Free Space: ' + d.FreeSpace / 1024 + ' Kbytes';
+    return (s);
+};
+
+
+//source -- https://msdn.microsoft.com/en-us/library/kaf6yaft(v=vs.84).aspx
+var getALine = (filespec: string) => {
+    var fso = new ActiveXObject('Scripting.FileSystemObject');
+    var file = fso.OpenTextFile(filespec, Scripting.IOMode.ForReading, false);
+
+    var s = '';
+    while (!file.AtEndOfLine) {
+        s += file.Read(1);
+    }
+    file.Close();
+    return (s);
+};
\ No newline at end of file
diff --git a/types/activex-scripting-runtime/activex-scripting-runtime-tests.ts b/types/activex-scripting/activex-scripting.ts
similarity index 100%
rename from types/activex-scripting-runtime/activex-scripting-runtime-tests.ts
rename to types/activex-scripting/activex-scripting.ts
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
new file mode 100644
index 0000000000..55bf6bd661
--- /dev/null
+++ b/types/activex-scripting/index.d.ts
@@ -0,0 +1,513 @@
+// Type definitions for Scripting - 
+// Project: https://msdn.microsoft.com/en-us/library/bstcxhf7.aspx
+// Defintions by: Zev Spitz <https://github.com/zspitz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+declare namespace Scripting {
+
+    //Enums
+    const enum __MIDL___MIDL_itf_scrrun_0000_0000_0001 {
+        Alias = 1024,
+        Archive = 32,
+        Compressed = 2048,
+        Directory = 16,
+        Hidden = 2,
+        Normal = 0,
+        ReadOnly = 1,
+        System = 4,
+        Volume = 8
+    }
+
+    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0001 {
+        CDRom = 4,
+        Fixed = 2,
+        RamDisk = 5,
+        Remote = 3,
+        Removable = 1,
+        UnknownType = 0
+    }
+
+    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0002 {
+        SystemFolder = 1,
+        TemporaryFolder = 2,
+        WindowsFolder = 0
+    }
+
+    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0003 {
+        StdErr = 2,
+        StdIn = 0,
+        StdOut = 1
+    }
+
+    const enum CompareMethod {
+        BinaryCompare = 0,
+        DatabaseCompare = 2,
+        TextCompare = 1
+    }
+
+    const enum DriveTypeConst {
+        CDRom = 4,
+        Fixed = 2,
+        RamDisk = 5,
+        Remote = 3,
+        Removable = 1,
+        UnknownType = 0
+    }
+
+    const enum FileAttribute {
+        Alias = 1024,
+        Archive = 32,
+        Compressed = 2048,
+        Directory = 16,
+        Hidden = 2,
+        Normal = 0,
+        ReadOnly = 1,
+        System = 4,
+        Volume = 8
+    }
+
+    const enum IOMode {
+        ForAppending = 8,
+        ForReading = 1,
+        ForWriting = 2
+    }
+
+    const enum SpecialFolderConst {
+        SystemFolder = 1,
+        TemporaryFolder = 2,
+        WindowsFolder = 0
+    }
+
+    const enum StandardStreamTypes {
+        StdErr = 2,
+        StdIn = 0,
+        StdOut = 1
+    }
+
+    const enum Tristate {
+        TristateFalse = 0,
+        TristateMixed = -2,
+        TristateTrue = -1,
+        TristateUseDefault = -2
+    }
+
+    //Interfaces
+    /** Scripting.Dictionary */
+    interface Dictionary {
+        
+        /** Add a new key and item to the dictionary. */
+        Add(Key: any, Item: any): void;
+        
+        /** Set or get the string comparison method. */
+        CompareMode: CompareMethod;
+        
+        /** Get the number of items in the dictionary. */
+        readonly Count: number;
+        
+        /** Determine if a given key is in the dictionary. */
+        Exists(Key: any): boolean;
+        HashVal(Key: any): any;
+        
+        /** Set or get the item for a given key */
+        Item(Key: any): any;
+        
+        /** Get an array containing all items in the dictionary. */
+        Items(): any;
+        
+        /** Change a key to a different key. */
+        Key(Key: any): any;
+        
+        /** Get an array containing all keys in the dictionary. */
+        Keys(): any;
+        
+        /** Remove a given key from the dictionary. */
+        Remove(Key: any): void;
+        
+        /** Remove all information from the dictionary. */
+        RemoveAll(): void;
+    }
+
+    /** Drive Object */
+    interface Drive {
+        
+        /** Get available space */
+        readonly AvailableSpace: any;
+        
+        /** Drive letter */
+        readonly DriveLetter: string;
+        
+        /** Drive type */
+        readonly DriveType: DriveTypeConst;
+        
+        /** Filesystem type */
+        readonly FileSystem: string;
+        
+        /** Get drive free space */
+        readonly FreeSpace: any;
+        
+        /** Check if disk is available */
+        readonly IsReady: boolean;
+        
+        /** Path */
+        readonly Path: string;
+        
+        /** Root folder */
+        readonly RootFolder: Folder;
+        
+        /** Serial number */
+        readonly SerialNumber: number;
+        
+        /** Share name */
+        readonly ShareName: string;
+        
+        /** Get total drive size */
+        readonly TotalSize: any;
+        
+        /** Name of volume */
+        VolumeName: string;
+    }
+
+    /** Collection of drives associated with drive letters */
+    interface Drives {
+        
+        /** Number of drives */
+        readonly Count: number;
+        
+        /** Get drive */
+        Item(Key: any): Drive;
+    }
+
+    /** Script Encoder Object */
+    interface Encoder {
+        
+        /** Call the Encoder determined by szExt, passing bstrStreamIn and optional arguments */
+        EncodeScriptFile(szExt: string, bstrStreamIn: string, cFlags: number, bstrDefaultLang: string): string;
+    }
+
+    /** File object */
+    interface File {
+        
+        /** File attributes */
+        Attributes: FileAttribute;
+        
+        /**
+        * Copy this file
+        * @param boolean [OverWriteFiles=true]
+        */
+        Copy(Destination: string, OverWriteFiles?: boolean): void;
+        
+        /** Date file was created */
+        readonly DateCreated: VarDate;
+        
+        /** Date file was last accessed */
+        readonly DateLastAccessed: VarDate;
+        
+        /** Date file was last modified */
+        readonly DateLastModified: VarDate;
+        
+        /**
+        * Delete this file
+        * @param boolean [Force=false]
+        */
+        Delete(Force?: boolean): void;
+        
+        /** Get drive that contains file */
+        readonly Drive: Drive;
+        
+        /** Move this file */
+        Move(Destination: string): void;
+        
+        /** Get name of file */
+        Name: string;
+        
+        /**
+        * Open a file as a TextStream
+        * @param Scripting.IOMode [IOMode=1]
+        * @param Scripting.Tristate [Format=0]
+        */
+        OpenAsTextStream(IOMode?: IOMode, Format?: Tristate): TextStream;
+        
+        /** Get folder that contains file */
+        readonly ParentFolder: Folder;
+        
+        /** Path to the file */
+        readonly Path: string;
+        
+        /** Short name */
+        readonly ShortName: string;
+        
+        /** Short path */
+        readonly ShortPath: string;
+        
+        /** File size */
+        readonly Size: any;
+        
+        /** Type description */
+        readonly Type: string;
+    }
+
+    /** Collection of files in a folder */
+    interface Files {
+        
+        /** Number of folders */
+        readonly Count: number;
+        
+        /** Get file */
+        Item(Key: any): File;
+    }
+
+    /** FileSystem Object */
+    interface FileSystemObject {
+        
+        /** Generate a path from an existing path and a name */
+        BuildPath(Path: string, Name: string): string;
+        
+        /**
+        * Copy a file
+        * @param boolean [OverWriteFiles=true]
+        */
+        CopyFile(Source: string, Destination: string, OverWriteFiles?: boolean): void;
+        
+        /**
+        * Copy a folder
+        * @param boolean [OverWriteFiles=true]
+        */
+        CopyFolder(Source: string, Destination: string, OverWriteFiles?: boolean): void;
+        
+        /** Create a folder */
+        CreateFolder(Path: string): Folder;
+        
+        /**
+        * Create a file as a TextStream
+        * @param boolean [Overwrite=true]
+        * @param boolean [Unicode=false]
+        */
+        CreateTextFile(FileName: string, Overwrite?: boolean, Unicode?: boolean): TextStream;
+        
+        /**
+        * Delete a file
+        * @param boolean [Force=false]
+        */
+        DeleteFile(FileSpec: string, Force?: boolean): void;
+        
+        /**
+        * Delete a folder
+        * @param boolean [Force=false]
+        */
+        DeleteFolder(FolderSpec: string, Force?: boolean): void;
+        
+        /** Check if a drive or a share exists */
+        DriveExists(DriveSpec: string): boolean;
+        
+        /** Get drives collection */
+        readonly Drives: Drives;
+        
+        /** Check if a file exists */
+        FileExists(FileSpec: string): boolean;
+        
+        /** Check if a path exists */
+        FolderExists(FolderSpec: string): boolean;
+        
+        /** Return the canonical representation of the path */
+        GetAbsolutePathName(Path: string): string;
+        
+        /** Return base name from a path */
+        GetBaseName(Path: string): string;
+        
+        /** Get drive or UNC share */
+        GetDrive(DriveSpec: string): Drive;
+        
+        /** Return drive from a path */
+        GetDriveName(Path: string): string;
+        
+        /** Return extension from path */
+        GetExtensionName(Path: string): string;
+        
+        /** Get file */
+        GetFile(FilePath: string): File;
+        
+        /** Return the file name from a path */
+        GetFileName(Path: string): string;
+        
+        /** Retrieve the file version of the specified file into a string */
+        GetFileVersion(FileName: string): string;
+        
+        /** Get folder */
+        GetFolder(FolderPath: string): Folder;
+        
+        /** Return path to the parent folder */
+        GetParentFolderName(Path: string): string;
+        
+        /** Get location of various system folders */
+        GetSpecialFolder(SpecialFolder: SpecialFolderConst): Folder;
+        
+        /**
+        * Retrieve the standard input, output or error stream
+        * @param boolean [Unicode=false]
+        */
+        GetStandardStream(StandardStreamType: StandardStreamTypes, Unicode?: boolean): TextStream;
+        
+        /** Generate name that can be used to name a temporary file */
+        GetTempName(): string;
+        
+        /** Move a file */
+        MoveFile(Source: string, Destination: string): void;
+        
+        /** Move a folder */
+        MoveFolder(Source: string, Destination: string): void;
+        
+        /**
+        * Open a file as a TextStream
+        * @param Scripting.IOMode [IOMode=1]
+        * @param boolean [Create=false]
+        * @param Scripting.Tristate [Format=0]
+        */
+        OpenTextFile(FileName: string, IOMode?: IOMode, Create?: boolean, Format?: Tristate): TextStream;
+    }
+
+    /** Folder object */
+    interface Folder {
+        
+        /** Folder attributes */
+        Attributes: FileAttribute;
+        
+        /**
+        * Copy this folder
+        * @param boolean [OverWriteFiles=true]
+        */
+        Copy(Destination: string, OverWriteFiles?: boolean): void;
+        
+        /**
+        * Create a file as a TextStream
+        * @param boolean [Overwrite=true]
+        * @param boolean [Unicode=false]
+        */
+        CreateTextFile(FileName: string, Overwrite?: boolean, Unicode?: boolean): TextStream;
+        
+        /** Date folder was created */
+        readonly DateCreated: VarDate;
+        
+        /** Date folder was last accessed */
+        readonly DateLastAccessed: VarDate;
+        
+        /** Date folder was last modified */
+        readonly DateLastModified: VarDate;
+        
+        /**
+        * Delete this folder
+        * @param boolean [Force=false]
+        */
+        Delete(Force?: boolean): void;
+        
+        /** Get drive that contains folder */
+        readonly Drive: Drive;
+        
+        /** Get files collection */
+        readonly Files: Files;
+        
+        /** True if folder is root */
+        readonly IsRootFolder: boolean;
+        
+        /** Move this folder */
+        Move(Destination: string): void;
+        
+        /** Get name of folder */
+        Name: string;
+        
+        /** Get parent folder */
+        readonly ParentFolder: Folder;
+        
+        /** Path to folder */
+        readonly Path: string;
+        
+        /** Short name */
+        readonly ShortName: string;
+        
+        /** Short path */
+        readonly ShortPath: string;
+        
+        /** Sum of files and subfolders */
+        readonly Size: any;
+        
+        /** Get folders collection */
+        readonly SubFolders: Folders;
+        
+        /** Type description */
+        readonly Type: string;
+    }
+
+    /** Collection of subfolders in a folder */
+    interface Folders {
+        
+        /** Create a new folder */
+        Add(Name: string): Folder;
+        
+        /** Number of folders */
+        readonly Count: number;
+        
+        /** Get folder */
+        Item(Key: any): Folder;
+    }
+
+    /** TextStream object */
+    interface TextStream {
+        
+        /** Is the current position at the end of a line? */
+        readonly AtEndOfLine: boolean;
+        
+        /** Is the current position at the end of the stream? */
+        readonly AtEndOfStream: boolean;
+        
+        /** Close a text stream */
+        Close(): void;
+        
+        /** Current column number */
+        readonly Column: number;
+        
+        /** Current line number */
+        readonly Line: number;
+        
+        /** Read a specific number of characters into a string */
+        Read(Characters: number): string;
+        
+        /** Read the entire stream into a string */
+        ReadAll(): string;
+        
+        /** Read an entire line into a string */
+        ReadLine(): string;
+        
+        /** Skip a specific number of characters */
+        Skip(Characters: number): void;
+        
+        /** Skip a line */
+        SkipLine(): void;
+        
+        /** Write a string to the stream */
+        Write(Text: string): void;
+        
+        /** Write a number of blank lines to the stream */
+        WriteBlankLines(Lines: number): void;
+        
+        /**
+        * Write a string and an end of line to the stream
+        * @param string [Text='']
+        */
+        WriteLine(Text?: string): void;
+    }
+
+}
+
+//Global interfaces
+interface ActiveXObject {
+    set(obj: Scripting.Dictionary, propertyName: 'Item', parameterTypes: [any], newValue: any): void;
+    new(progid: 'Scripting.Dictionary'): Scripting.Dictionary;
+    new(progid: 'Scripting.Encoder'): Scripting.Encoder;
+    new(progid: 'Scripting.FileSystemObject'): Scripting.FileSystemObject;
+}
+
+interface EnumeratorConstructor {
+    new(col: Scripting.Dictionary): any;
+    new(col: Scripting.Drives): Scripting.Drive;
+    new(col: Scripting.Files): Scripting.File;
+    new(col: Scripting.Folders): Scripting.Folder;
+}
+
diff --git a/types/activex-scripting/package.json b/types/activex-scripting/package.json
new file mode 100644
index 0000000000..d798f99261
--- /dev/null
+++ b/types/activex-scripting/package.json
@@ -0,0 +1 @@
+{ "dependencies": { "activex-helpers": "*"}}
\ No newline at end of file
diff --git a/types/activex-scripting-runtime/tsconfig.json b/types/activex-scripting/tsconfig.json
similarity index 54%
rename from types/activex-scripting-runtime/tsconfig.json
rename to types/activex-scripting/tsconfig.json
index f5e74f9dd6..badf87e17e 100644
--- a/types/activex-scripting-runtime/tsconfig.json
+++ b/types/activex-scripting/tsconfig.json
@@ -1,14 +1,9 @@
+
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom",
-            "scripthost"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
+        "lib": ["scripthost"],
+        "strict": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "activex-scripting-runtime-tests.ts"
+        "activex-scripting-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/activex-scripting/tslint.json b/types/activex-scripting/tslint.json
new file mode 100644
index 0000000000..1d0e17119e
--- /dev/null
+++ b/types/activex-scripting/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint / dt.json" }
\ No newline at end of file
diff --git a/types/activex-windows-image-acquisition/activex-windows-image-acquisition-tests.ts b/types/activex-wia/activex-wia-tests.ts
similarity index 95%
rename from types/activex-windows-image-acquisition/activex-windows-image-acquisition-tests.ts
rename to types/activex-wia/activex-wia-tests.ts
index 549bb4433f..e775ec9239 100644
--- a/types/activex-windows-image-acquisition/activex-windows-image-acquisition-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -63,9 +63,5 @@ while (!e.atEnd()) {
         }
     }
 
-    if (WScript) {
-        WScript.Echo(s);
-    } else if (window) {
-        window.alert(s);
-    }
+    WScript.Echo(s);
 }
\ No newline at end of file
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
new file mode 100644
index 0000000000..d79adff2a4
--- /dev/null
+++ b/types/activex-wia/index.d.ts
@@ -0,0 +1,697 @@
+// Type definitions for WIA - 
+// Project: 
+// Defintions by: Zev Spitz <https://github.com/zspitz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+declare namespace WIA {
+
+    //Enums
+        /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */
+    const enum CommandID {
+        wiaCommandChangeDocument = '{04E725B0-ACAE-11D2-A093-00C04F72DC3C}',
+        wiaCommandDeleteAllItems = '{E208C170-ACAD-11D2-A093-00C04F72DC3C}',
+        wiaCommandSynchronize = '{9B26B7B2-ACAD-11D2-A093-00C04F72DC3C}',
+        wiaCommandTakePicture = '{AF933CAC-ACAD-11D2-A093-00C04F72DC3C}',
+        wiaCommandUnloadDocument = '{1F3B3D8E-ACAE-11D2-A093-00C04F72DC3C}'
+    }
+
+        /** String versions of globally unique identifiers (GUIDs) that identify DeviceManager events. */
+    const enum EventID {
+        wiaEventDeviceConnected = '{A28BBADE-64B6-11D2-A231-00C04FA31809}',
+        wiaEventDeviceDisconnected = '{143E4E83-6497-11D2-A231-00C04FA31809}',
+        wiaEventItemCreated = '{4C8F4EF5-E14F-11D2-B326-00C04F68CE61}',
+        wiaEventItemDeleted = '{1D22A559-E14F-11D2-B326-00C04F68CE61}',
+        wiaEventScanEmailImage = '{C686DCEE-54F2-419E-9A27-2FC7F2E98F9E}',
+        wiaEventScanFaxImage = '{C00EB793-8C6E-11D2-977A-0000F87A926F}',
+        wiaEventScanFilmImage = '{9B2B662C-6185-438C-B68B-E39EE25E71CB}',
+        wiaEventScanImage = '{A6C5A715-8C6E-11D2-977A-0000F87A926F}',
+        wiaEventScanImage2 = '{FC4767C1-C8B3-48A2-9CFA-2E90CB3D3590}',
+        wiaEventScanImage3 = '{154E27BE-B617-4653-ACC5-0FD7BD4C65CE}',
+        wiaEventScanImage4 = '{A65B704A-7F3C-4447-A75D-8A26DFCA1FDF}',
+        wiaEventScanOCRImage = '{9D095B89-37D6-4877-AFED-62A297DC6DBE}',
+        wiaEventScanPrintImage = '{B441F425-8C6E-11D2-977A-0000F87A926F}'
+    }
+
+        /** String versions of globally unique identifiers (GUIDs) that indicate the file format of an image. */
+    const enum FormatID {
+        wiaFormatBMP = '{B96B3CAB-0728-11D3-9D7B-0000F81EF32E}',
+        wiaFormatGIF = '{B96B3CB0-0728-11D3-9D7B-0000F81EF32E}',
+        wiaFormatJPEG = '{B96B3CAE-0728-11D3-9D7B-0000F81EF32E}',
+        wiaFormatPNG = '{B96B3CAF-0728-11D3-9D7B-0000F81EF32E}',
+        wiaFormatTIFF = '{B96B3CB1-0728-11D3-9D7B-0000F81EF32E}'
+    }
+
+        /** Miscellaneous string constants */
+    const enum Miscellaneous {
+        wiaAnyDeviceID = '*',
+        wiaIDUnknown = '{00000000-0000-0000-0000-000000000000}'
+    }
+
+        /** The WiaDeviceType enumeration specifies the type of device attached to a user's computer. Use the Type property on the DeviceInfo object or the Device object to obtain these values from the device. */
+    const enum WiaDeviceType {
+        CameraDeviceType = 2,
+        ScannerDeviceType = 1,
+        UnspecifiedDeviceType = 0,
+        VideoDeviceType = 3
+    }
+
+        /** A DeviceEvent's type is composed of bits from the WiaEventFlags enumeration. You can test a DeviceEvent's type by using the AND operation with DeviceEvent.Type and a member from the WiaEventFlags enumeration. */
+    const enum WiaEventFlag {
+        ActionEvent = 2,
+        NotificationEvent = 1
+    }
+
+        /** The WiaImageBias enumeration helps specify what type of data the image is intended to represent. */
+    const enum WiaImageBias {
+        MaximizeQuality = 131072,
+        MinimizeSize = 65536
+    }
+
+        /** The WiaImageIntent enumeration helps specify what type of data the image is intended to represent. */
+    const enum WiaImageIntent {
+        ColorIntent = 1,
+        GrayscaleIntent = 2,
+        TextIntent = 4,
+        UnspecifiedIntent = 0
+    }
+
+        /** The WiaImagePropertyType enumeration specifies the type of the value of an image property. Image properties can be found in the Properties collection of an ImageFile object. */
+    const enum WiaImagePropertyType {
+        ByteImagePropertyType = 1001,
+        LongImagePropertyType = 1004,
+        RationalImagePropertyType = 1006,
+        StringImagePropertyType = 1002,
+        UndefinedImagePropertyType = 1000,
+        UnsignedIntegerImagePropertyType = 1003,
+        UnsignedLongImagePropertyType = 1005,
+        UnsignedRationalImagePropertyType = 1007,
+        VectorOfBytesImagePropertyType = 1101,
+        VectorOfLongsImagePropertyType = 1103,
+        VectorOfRationalsImagePropertyType = 1105,
+        VectorOfUndefinedImagePropertyType = 1100,
+        VectorOfUnsignedIntegersImagePropertyType = 1102,
+        VectorOfUnsignedLongsImagePropertyType = 1104,
+        VectorOfUnsignedRationalsImagePropertyType = 1106
+    }
+
+        /** An Item's type is composed of bits from the WiaItemFlags enumeration. You can test an Item's type by using the AND operation with Item.Properties("Item Flags") and a member from the WiaItemFlags enumeration. */
+    const enum WiaItemFlag {
+        AnalyzeItemFlag = 16,
+        AudioItemFlag = 32,
+        BurstItemFlag = 2048,
+        DeletedItemFlag = 128,
+        DeviceItemFlag = 64,
+        DisconnectedItemFlag = 256,
+        FileItemFlag = 2,
+        FolderItemFlag = 4,
+        FreeItemFlag = 0,
+        GeneratedItemFlag = 16384,
+        HasAttachmentsItemFlag = 32768,
+        HPanoramaItemFlag = 512,
+        ImageItemFlag = 1,
+        RemovedItemFlag = -2147483648,
+        RootItemFlag = 8,
+        StorageItemFlag = 4096,
+        TransferItemFlag = 8192,
+        VideoItemFlag = 65536,
+        VPanoramaItemFlag = 1024
+    }
+
+        /** The WiaPropertyType enumeration specifies the type of the value of an item property. Item properties can be found in the Properties collection of a Device or Item object. */
+    const enum WiaPropertyType {
+        BooleanPropertyType = 1,
+        BytePropertyType = 2,
+        ClassIDPropertyType = 15,
+        CurrencyPropertyType = 12,
+        DatePropertyType = 13,
+        DoublePropertyType = 11,
+        ErrorCodePropertyType = 7,
+        FileTimePropertyType = 14,
+        HandlePropertyType = 18,
+        IntegerPropertyType = 3,
+        LargeIntegerPropertyType = 8,
+        LongPropertyType = 5,
+        ObjectPropertyType = 17,
+        SinglePropertyType = 10,
+        StringPropertyType = 16,
+        UnsignedIntegerPropertyType = 4,
+        UnsignedLargeIntegerPropertyType = 9,
+        UnsignedLongPropertyType = 6,
+        UnsupportedPropertyType = 0,
+        VariantPropertyType = 19,
+        VectorOfBooleansPropertyType = 101,
+        VectorOfBytesPropertyType = 102,
+        VectorOfClassIDsPropertyType = 115,
+        VectorOfCurrenciesPropertyType = 112,
+        VectorOfDatesPropertyType = 113,
+        VectorOfDoublesPropertyType = 111,
+        VectorOfErrorCodesPropertyType = 107,
+        VectorOfFileTimesPropertyType = 114,
+        VectorOfIntegersPropertyType = 103,
+        VectorOfLargeIntegersPropertyType = 108,
+        VectorOfLongsPropertyType = 105,
+        VectorOfSinglesPropertyType = 110,
+        VectorOfStringsPropertyType = 116,
+        VectorOfUnsignedIntegersPropertyType = 104,
+        VectorOfUnsignedLargeIntegersPropertyType = 109,
+        VectorOfUnsignedLongsPropertyType = 106,
+        VectorOfVariantsPropertyType = 119
+    }
+
+        /** The WiaSubType enumeration specifies more detail about the property value. Use the SubType property on the Property object to obtain these values for the property. */
+    const enum WiaSubType {
+        FlagSubType = 3,
+        ListSubType = 2,
+        RangeSubType = 1,
+        UnspecifiedSubType = 0
+    }
+
+    //Interfaces
+    /** The CommonDialog control is an invisible-at-runtime control that contains all the methods that display a User Interface. A CommonDialog control can be created using "WIA.CommonDialog" in a call to CreateObject or by dropping a CommonDialog on a form. */
+    interface CommonDialog {
+        
+        /**
+        * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile object on success, otherwise Nothing
+        * @param WIA.WiaDeviceType [DeviceType=0]
+        * @param WIA.WiaImageIntent [Intent=0]
+        * @param WIA.WiaImageBias [Bias=131072]
+        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+        * @param boolean [AlwaysSelectDevice=false]
+        * @param boolean [UseCommonUI=true]
+        * @param boolean [CancelError=false]
+        */
+        ShowAcquireImage(DeviceType?: WiaDeviceType, Intent?: WiaImageIntent, Bias?: WiaImageBias, FormatID?: string, AlwaysSelectDevice?: boolean, UseCommonUI?: boolean, CancelError?: boolean): ImageFile;
+        
+        /** Launches the Windows Scanner and Camera Wizard and returns Nothing. Future versions may return a collection of ImageFile objects. */
+        ShowAcquisitionWizard(Device: Device): any;
+        
+        /**
+        * Displays the properties dialog box for the specified Device
+        * @param boolean [CancelError=false]
+        */
+        ShowDeviceProperties(Device: Device, CancelError?: boolean): void;
+        
+        /**
+        * Displays the properties dialog box for the specified Item
+        * @param boolean [CancelError=false]
+        */
+        ShowItemProperties(Item: Item, CancelError?: boolean): void;
+        
+        /** Launches the Photo Printing Wizard with the absolute path of a specific file or Vector of absolute paths to files */
+        ShowPhotoPrintingWizard(Files: any): void;
+        
+        /**
+        * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success, otherwise Nothing
+        * @param WIA.WiaDeviceType [DeviceType=0]
+        * @param boolean [AlwaysSelectDevice=false]
+        * @param boolean [CancelError=false]
+        */
+        ShowSelectDevice(DeviceType?: WiaDeviceType, AlwaysSelectDevice?: boolean, CancelError?: boolean): Device;
+        
+        /**
+        * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an Items collection on success, otherwise Nothing
+        * @param WIA.WiaImageIntent [Intent=0]
+        * @param WIA.WiaImageBias [Bias=131072]
+        * @param boolean [SingleSelect=true]
+        * @param boolean [UseCommonUI=true]
+        * @param boolean [CancelError=false]
+        */
+        ShowSelectItems(Device: Device, Intent?: WiaImageIntent, Bias?: WiaImageBias, SingleSelect?: boolean, UseCommonUI?: boolean, CancelError?: boolean): Items;
+        
+        /**
+        * Displays a progress dialog box while transferring the specified Item to the local machine. See Item.Transfer for additional information.
+        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+        * @param boolean [CancelError=false]
+        */
+        ShowTransfer(Item: Item, FormatID?: string, CancelError?: boolean): any;
+    }
+
+    /** The Device object represents an active connection to an imaging device. */
+    interface Device {
+        
+        /** A collection of all commands for this imaging device */
+        readonly Commands: DeviceCommands;
+        
+        /** Returns the DeviceID for this Device */
+        readonly DeviceID: string;
+        
+        /** A collection of all events for this imaging device */
+        readonly Events: DeviceEvents;
+        
+        /** Issues the command specified by CommandID to the imaging device. CommandIDs are device dependent. Valid CommandIDs for this Device are contained in the Commands collection. */
+        ExecuteCommand(CommandID: string): Item;
+        
+        /** Returns the Item object specified by ItemID if it exists */
+        GetItem(ItemID: string): Item;
+        
+        /** A collection of all items for this imaging device */
+        readonly Items: Items;
+        
+        /** A collection of all properties for this imaging device */
+        readonly Properties: Properties;
+        
+        /** Returns the Type of Device */
+        readonly Type: WiaDeviceType;
+        
+        /** Returns the underlying IWiaItem interface for this Device object */
+        readonly WiaItem: any;
+    }
+
+    /** The DeviceCommand object describes a CommandID that can be used when calling ExecuteCommand on a Device or Item object. */
+    interface DeviceCommand {
+        
+        /** Returns the commandID for this Command */
+        readonly CommandID: string;
+        
+        /** Returns the command Description */
+        readonly Description: string;
+        
+        /** Returns the command Name */
+        readonly Name: string;
+    }
+
+    /** The DeviceCommands object is a collection of all the supported DeviceCommands for an imaging device. See the Commands property of a Device or Item object for more details on determining the collection of supported device commands. */
+    interface DeviceCommands {
+        
+        /** Returns the number of members in the collection */
+        readonly Count: number;
+        
+        /** Returns the specified item in the collection by position */
+        Item(Index: number): DeviceCommand;
+    }
+
+    /** The DeviceEvent object describes an EventID that can be used when calling RegisterEvent or RegisterPersistentEvent on a DeviceManager object. */
+    interface DeviceEvent {
+        
+        /** Returns the event Description */
+        readonly Description: string;
+        
+        /** Returns the EventID for this Event */
+        readonly EventID: string;
+        
+        /** Returns the event Name */
+        readonly Name: string;
+        
+        /** Returns the Type of this Event */
+        readonly Type: WiaEventFlag;
+    }
+
+    /** The DeviceEvents object is a collection of all the supported DeviceEvent for an imaging device. See the Events property of a Device object for more details on determining the collection of supported device events. */
+    interface DeviceEvents {
+        
+        /** Returns the number of members in the collection */
+        readonly Count: number;
+        
+        /** Returns the specified item in the collection by position */
+        Item(Index: number): DeviceEvent;
+    }
+
+    /** The DeviceInfo object is a container that describes the unchanging (static) properties of an imaging device that is currently connected to the computer. */
+    interface DeviceInfo {
+        
+        /** Establish a connection with this device and return a Device object */
+        Connect(): Device;
+        
+        /** Returns the DeviceID for this Device */
+        readonly DeviceID: string;
+        
+        /** A collection of all properties for this imaging device that are applicable when the device is not connected */
+        readonly Properties: Properties;
+        
+        /** Returns the Type of Device */
+        readonly Type: WiaDeviceType;
+    }
+
+    /** The DeviceInfos object is a collection of all the imaging devices currently connected to the computer. See the DeviceInfos property on the DeviceManager object for detail on accessing the DeviceInfos object. */
+    interface DeviceInfos {
+        
+        /** Returns the number of members in the collection */
+        readonly Count: number;
+        
+        /** Returns the specified item in the collection either by position or Device ID */
+        Item(Index: any): DeviceInfo;
+    }
+
+    /** The DeviceManager control is an invisible-at-runtime control that manages the imaging devices connected to the computer. A DeviceManager control can be created using "WIA.DeviceManager" in a call to CreateObject or by dropping a DeviceManager on a form. */
+    interface DeviceManager {
+        
+        /** A collection of all imaging devices connected to this computer */
+        readonly DeviceInfos: DeviceInfos;
+        
+        /**
+        * Registers the specified EventID for the specified DeviceID. If DeviceID is "*" then OnEvent will be called whenever the event specified occurs for any device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
+        * @param string [DeviceID='*']
+        */
+        RegisterEvent(EventID: string, DeviceID?: string): void;
+        
+        /**
+        * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full path name and the appropriate command-line arguments needed to invoke the application.
+        * @param string [DeviceID='*']
+        */
+        RegisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
+        
+        /**
+        * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called RegisterEvent.
+        * @param string [DeviceID='*']
+        */
+        UnregisterEvent(EventID: string, DeviceID?: string): void;
+        
+        /**
+        * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the Command, Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
+        * @param string [DeviceID='*']
+        */
+        UnregisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
+    }
+
+    /** The Filter object represents a unit of modification on an ImageFile. To use a Filter, add it to the Filters collection, then set the filter's properties and finally use the Apply method of the ImageProcess object to filter an ImageFile. */
+    interface Filter {
+        
+        /** Returns a Description of what the filter does */
+        readonly Description: string;
+        
+        /** Returns the FilterID for this Filter */
+        readonly FilterID: string;
+        
+        /** Returns the Filter Name */
+        readonly Name: string;
+        
+        /** A collection of all properties for this filter */
+        readonly Properties: Properties;
+    }
+
+    /** The FilterInfo object is a container that describes a Filter object without requiring a Filter to be Added to the process chain. See the FilterInfos property on the ImageProcess object for details on accessing FilterInfo objects. */
+    interface FilterInfo {
+        
+        /** Returns a technical Description of what the filter does and how to use it in a filter chain */
+        readonly Description: string;
+        
+        /** Returns the FilterID for this filter */
+        readonly FilterID: string;
+        
+        /** Returns the FilterInfo Name */
+        readonly Name: string;
+    }
+
+    /** The FilterInfos object is a collection of all the available FilterInfo objects. See the FilterInfos property on the ImageProcess object for detail on accessing the FilterInfos object. */
+    interface FilterInfos {
+        
+        /** Returns the number of members in the collection */
+        readonly Count: number;
+        
+        /** Returns the specified item in the collection either by position or name */
+        Item(Index: any): FilterInfo;
+    }
+
+    /** The Filters object is a collection of the Filters that will be applied to an ImageFile when you call the Apply method on the ImageProcess object. */
+    interface Filters {
+        
+        /**
+        * Appends/Inserts a new Filter of the specified FilterID into a Filter collection
+        * @param number [Index=0]
+        */
+        Add(FilterID: string, Index?: number): void;
+        
+        /** Returns the number of members in the collection */
+        readonly Count: number;
+        
+        /** Returns the specified item in the collection by position or FilterID */
+        Item(Index: number): Filter;
+        
+        /** Removes the designated filter */
+        Remove(Index: number): void;
+    }
+
+    /** The Formats object is a collection of supported FormatIDs that you can use when calling Transfer on an Item object or ShowTransfer on a CommonDialog object for this Item. */
+    interface Formats {
+        
+        /** Returns the number of members in the collection */
+        readonly Count: number;
+        
+        /** Returns the specified item in the collection by position */
+        Item(Index: number): string;
+    }
+
+    /** The ImageFile object is a container for images transferred to your computer when you call Transfer or ShowTransfer. It also supports image files through LoadFile. An ImageFile object can be created using "WIA.ImageFile" in a call to CreateObject. */
+    interface ImageFile {
+        
+        /** Returns/Sets the current frame in the image */
+        ActiveFrame: number;
+        
+        /** Returns the raw image bits as a Vector of Long values */
+        readonly ARGBData: Vector;
+        
+        /** Returns the raw image file as a Vector of Bytes */
+        readonly FileData: Vector;
+        
+        /** Returns the file extension for this image file type */
+        readonly FileExtension: string;
+        
+        /** Returns the FormatID for this file type */
+        readonly FormatID: string;
+        
+        /** Returns the number of frames in the image */
+        readonly FrameCount: number;
+        
+        /** Returns the Height of the image in pixels */
+        readonly Height: number;
+        
+        /** Returns the Horizontal pixels per inch of the image */
+        readonly HorizontalResolution: number;
+        
+        /** Indicates if the pixel format has an alpha component */
+        readonly IsAlphaPixelFormat: boolean;
+        
+        /** Indicates whether the image is animated */
+        readonly IsAnimated: boolean;
+        
+        /** Indicates if the pixel format is extended (16 bits/channel) */
+        readonly IsExtendedPixelFormat: boolean;
+        
+        /** Indicates if the pixel data is an index into a palette or the actual color data */
+        readonly IsIndexedPixelFormat: boolean;
+        
+        /** Loads the ImageFile object with the specified File */
+        LoadFile(Filename: string): void;
+        
+        /** Returns the depth of the pixels of the image in bits per pixel */
+        readonly PixelDepth: number;
+        
+        /** A collection of all properties for this image */
+        readonly Properties: Properties;
+        
+        /** Save the ImageFile object to the specified File */
+        SaveFile(Filename: string): void;
+        
+        /** Returns the Vertical pixels per inch of the image */
+        readonly VerticalResolution: number;
+        
+        /** Returns the Width of the image in pixels */
+        readonly Width: number;
+    }
+
+    /** The ImageProcess object manages the filter chain. An ImageProcess object can be created using "WIA.ImageProcess" in a call to CreateObject. */
+    interface ImageProcess {
+        
+        /** Takes the specified ImageFile and returns the new ImageFile with all the filters applied on success */
+        Apply(Source: ImageFile): ImageFile;
+        
+        /** A collection of all available filters */
+        readonly FilterInfos: FilterInfos;
+        
+        /** A collection of the filters to be applied in this process */
+        readonly Filters: Filters;
+    }
+
+    /** The Item object is a container for an item on an imaging device object. See the Items property on the Device or Item object for details on accessing Item objects. */
+    interface Item {
+        
+        /** A collection of all commands for this item */
+        readonly Commands: DeviceCommands;
+        
+        /** Issues the command specified by CommandID. CommandIDs are device dependent. Valid CommandIDs for this Item are contained in the Commands collection. */
+        ExecuteCommand(CommandID: string): Item;
+        
+        /** A collection of all supported format types for this item */
+        readonly Formats: Formats;
+        
+        /** Returns the ItemID for this Item */
+        readonly ItemID: string;
+        
+        /** A collection of all child items for this item */
+        readonly Items: Items;
+        
+        /** A collection of all properties for this item */
+        readonly Properties: Properties;
+        
+        /**
+        * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging device. Future versions may return a collection of ImageFile objects.
+        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+        */
+        Transfer(FormatID?: string): any;
+        
+        /** Returns the underlying IWiaItem interface for this Item object */
+        readonly WiaItem: any;
+    }
+
+    /** The Items object contains a collection of Item objects. See the Items property on the Device or Item object for details on accessing the Items object. */
+    interface Items {
+        
+        /** Adds a new Item with the specified Name and Flags. The Flags value is created by using the OR operation with members of the WiaItemFlags enumeration. */
+        Add(Name: string, Flags: number): void;
+        
+        /** Returns the number of members in the collection */
+        readonly Count: number;
+        
+        /** Returns the specified item in the collection by position */
+        Item(Index: number): Item;
+        
+        /** Removes the designated Item */
+        Remove(Index: number): void;
+    }
+
+    /** The Properties object is a collection of all the Property objects associated with a given Device, DeviceInfo, Filter, ImageFile or Item object. See the Properties property on any of these objects for detail on accessing the Properties object. */
+    interface Properties {
+        
+        /** Returns the number of members in the collection */
+        readonly Count: number;
+        
+        /** Indicates whether the specified Property exists in the collection */
+        Exists(Index: any): boolean;
+        
+        /** Returns the specified item in the collection either by position or name. */
+        Item(Index: any): Property;
+    }
+
+    /** The Property object is a container for a property associated with a Device, DeviceInfo, Filter, ImageFile or Item object. See the Properties property on any of these objects for details on accessing Property objects. */
+    interface Property {
+        
+        /** Indicates whether the Property Value is read only */
+        readonly IsReadOnly: boolean;
+        
+        /** Indicates whether the Property Value is a vector */
+        readonly IsVector: boolean;
+        
+        /** Returns the Property Name */
+        readonly Name: string;
+        
+        /** Returns the PropertyID of this Property */
+        readonly PropertyID: number;
+        
+        /** Returns the SubType of the Property, if any */
+        readonly SubType: WiaSubType;
+        
+        /** Returns the default Property Value if the SubType is not UnspecifiedSubType */
+        readonly SubTypeDefault: any;
+        
+        /** Returns the maximum valid Property Value if the SubType is RangeSubType */
+        readonly SubTypeMax: number;
+        
+        /** Returns the minimum valid Property Value if the SubType is RangeSubType */
+        readonly SubTypeMin: number;
+        
+        /** Returns the step increment of Property Values if the SubType is RangeSubType */
+        readonly SubTypeStep: number;
+        
+        /** Returns a Vector of valid Property Values if the SubType is ListSubType or valid flag Values that can be ored together if the SubType is FlagSubType */
+        readonly SubTypeValues: Vector;
+        
+        /** Returns either a WiaPropertyType or a WiaImagePropertyType */
+        readonly Type: number;
+        
+        /** Returns/Sets the Property Value */
+        Value: any;
+    }
+
+    /** The Rational object is a container for the rational values found in Exif tags. It is a supported element type of the Vector object and may be created using "WIA.Rational" in a call to CreateObject. */
+    interface Rational {
+        
+        /** Returns/Sets the Rational Value Denominator */
+        Denominator: number;
+        
+        /** Returns/Sets the Rational Value Numerator */
+        Numerator: number;
+        
+        /** Returns the Rational Value as a Double */
+        readonly Value: number;
+    }
+
+    /** The Vector object is a collection of values of the same type. It is used throughout the library in many different ways. The Vector object may be created using "WIA.Vector" in a call to CreateObject. */
+    interface Vector {
+        
+        /**
+        * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the Vector collection.
+        * @param number [Index=0]
+        */
+        Add(Value: any, Index?: number): void;
+        
+        /** Returns/Sets the Vector of Bytes as an array of bytes */
+        BinaryData: any;
+        
+        /** Removes all elements. */
+        Clear(): void;
+        
+        /** Returns the number of members in the vector */
+        readonly Count: number;
+        
+        /** Returns/Sets the Vector of Integers from a Date */
+        Date: VarDate;
+        
+        /**
+        * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an ImageFile from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
+        * @param number [Width=0]
+        * @param number [Height=0]
+        */
+        ImageFile(Width?: number, Height?: number): ImageFile;
+        
+        /** Returns/Sets the specified item in the vector by position */
+        Item(Index: number): any;
+        
+        /**
+        * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs must be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
+        * @param number [Width=0]
+        * @param number [Height=0]
+        */
+        Picture(Width?: number, Height?: number): any;
+        
+        /** Removes the designated element and returns it if successful */
+        Remove(Index: number): any;
+        
+        /**
+        * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be stored as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
+        * @param boolean [Resizable=true]
+        * @param boolean [Unicode=true]
+        */
+        SetFromString(Value: string, Resizable?: boolean, Unicode?: boolean): void;
+        
+        /**
+        * Returns a Vector of Bytes as a String
+        * @param boolean [Unicode=true]
+        */
+        String(Unicode?: boolean): string;
+    }
+
+}
+
+//Global interfaces
+interface ActiveXObject {
+    on(obj: WIA.DeviceManager, eventName: 'OnEvent', eventArgs: ['EventID', 'DeviceID', 'ItemID'], handler: (this: WIA.DeviceManager, parameter: {EventID: string, DeviceID: string, ItemID: string}) => void): void;
+    set(obj: WIA.Vector, propertyName: 'Item', parameterTypes: [number], newValue: any): void;
+    new(progid: 'WIA.CommonDialog'): WIA.CommonDialog;
+    new(progid: 'WIA.DeviceManager'): WIA.DeviceManager;
+    new(progid: 'WIA.ImageFile'): WIA.ImageFile;
+    new(progid: 'WIA.ImageProcess'): WIA.ImageProcess;
+    new(progid: 'WIA.Rational'): WIA.Rational;
+    new(progid: 'WIA.Vector'): WIA.Vector;
+}
+
+interface EnumeratorConstructor {
+    new(col: WIA.DeviceCommands): WIA.DeviceCommand;
+    new(col: WIA.DeviceEvents): WIA.DeviceEvent;
+    new(col: WIA.DeviceInfos): WIA.DeviceInfo;
+    new(col: WIA.FilterInfos): WIA.FilterInfo;
+    new(col: WIA.Filters): WIA.Filter;
+    new(col: WIA.Formats): string;
+    new(col: WIA.Items): WIA.Item;
+    new(col: WIA.Properties): WIA.Property;
+    new(col: WIA.Vector): any;
+}
+
diff --git a/types/activex-wia/package.json b/types/activex-wia/package.json
new file mode 100644
index 0000000000..d798f99261
--- /dev/null
+++ b/types/activex-wia/package.json
@@ -0,0 +1 @@
+{ "dependencies": { "activex-helpers": "*"}}
\ No newline at end of file
diff --git a/types/activex-windows-image-acquisition/tsconfig.json b/types/activex-wia/tsconfig.json
similarity index 53%
rename from types/activex-windows-image-acquisition/tsconfig.json
rename to types/activex-wia/tsconfig.json
index 486d95921c..70a07b894d 100644
--- a/types/activex-windows-image-acquisition/tsconfig.json
+++ b/types/activex-wia/tsconfig.json
@@ -1,14 +1,9 @@
+
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom",
-            "scripthost"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
+        "lib": ["scripthost"],
+        "strict": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "activex-windows-image-acquisition-tests.ts"
+        "activex-wia-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/activex-wia/tslint.json b/types/activex-wia/tslint.json
new file mode 100644
index 0000000000..1d0e17119e
--- /dev/null
+++ b/types/activex-wia/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint / dt.json" }
\ No newline at end of file
diff --git a/types/activex-windows-image-acquisition/index.d.ts b/types/activex-windows-image-acquisition/index.d.ts
deleted file mode 100644
index af32d8a865..0000000000
--- a/types/activex-windows-image-acquisition/index.d.ts
+++ /dev/null
@@ -1,379 +0,0 @@
-// Type definitions for Microsoft Windows Image Acquisition Library v2.0
-// Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms630827(v=vs.85).aspx
-// Definitions by: Zev Spitz <https://github.com/zspitz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace WIA {
-
-    //Enums
-    type CommandID =
-        "'{04E725B0-ACAE-11D2-A093-00C04F72DC3C}'" //wiaCommandChangeDocument
-        | "'{E208C170-ACAD-11D2-A093-00C04F72DC3C}'" //wiaCommandDeleteAllItems
-        | "'{9B26B7B2-ACAD-11D2-A093-00C04F72DC3C}'" //wiaCommandSynchronize
-        | "'{AF933CAC-ACAD-11D2-A093-00C04F72DC3C}'" //wiaCommandTakePicture
-        | "'{1F3B3D8E-ACAE-11D2-A093-00C04F72DC3C}'"; //wiaCommandUnloadDocument
-    const CommandID: {
-        wiaCommandChangeDocument: CommandID,
-        wiaCommandDeleteAllItems: CommandID,
-        wiaCommandSynchronize: CommandID,
-        wiaCommandTakePicture: CommandID,
-        wiaCommandUnloadDocument: CommandID
-    };
-
-    type EventID =
-        "'{A28BBADE-64B6-11D2-A231-00C04FA31809}'" //wiaEventDeviceConnected
-        | "'{143E4E83-6497-11D2-A231-00C04FA31809}'" //wiaEventDeviceDisconnected
-        | "'{4C8F4EF5-E14F-11D2-B326-00C04F68CE61}'" //wiaEventItemCreated
-        | "'{1D22A559-E14F-11D2-B326-00C04F68CE61}'" //wiaEventItemDeleted
-        | "'{C686DCEE-54F2-419E-9A27-2FC7F2E98F9E}'" //wiaEventScanEmailImage
-        | "'{C00EB793-8C6E-11D2-977A-0000F87A926F}'" //wiaEventScanFaxImage
-        | "'{9B2B662C-6185-438C-B68B-E39EE25E71CB}'" //wiaEventScanFilmImage
-        | "'{A6C5A715-8C6E-11D2-977A-0000F87A926F}'" //wiaEventScanImage
-        | "'{FC4767C1-C8B3-48A2-9CFA-2E90CB3D3590}'" //wiaEventScanImage2
-        | "'{154E27BE-B617-4653-ACC5-0FD7BD4C65CE}'" //wiaEventScanImage3
-        | "'{A65B704A-7F3C-4447-A75D-8A26DFCA1FDF}'" //wiaEventScanImage4
-        | "'{9D095B89-37D6-4877-AFED-62A297DC6DBE}'" //wiaEventScanOCRImage
-        | "'{B441F425-8C6E-11D2-977A-0000F87A926F}'"; //wiaEventScanPrintImage
-    const EventID: {
-        wiaEventDeviceConnected: EventID,
-        wiaEventDeviceDisconnected: EventID,
-        wiaEventItemCreated: EventID,
-        wiaEventItemDeleted: EventID,
-        wiaEventScanEmailImage: EventID,
-        wiaEventScanFaxImage: EventID,
-        wiaEventScanFilmImage: EventID,
-        wiaEventScanImage: EventID,
-        wiaEventScanImage2: EventID,
-        wiaEventScanImage3: EventID,
-        wiaEventScanImage4: EventID,
-        wiaEventScanOCRImage: EventID,
-        wiaEventScanPrintImage: EventID
-    };
-
-    type FormatID =
-        "'{B96B3CAB-0728-11D3-9D7B-0000F81EF32E}'" //wiaFormatBMP
-        | "'{B96B3CB0-0728-11D3-9D7B-0000F81EF32E}'" //wiaFormatGIF
-        | "'{B96B3CAE-0728-11D3-9D7B-0000F81EF32E}'" //wiaFormatJPEG
-        | "'{B96B3CAF-0728-11D3-9D7B-0000F81EF32E}'" //wiaFormatPNG
-        | "'{B96B3CB1-0728-11D3-9D7B-0000F81EF32E}'"; //wiaFormatTIFF
-    const FormatID: {
-        wiaFormatBMP: FormatID,
-        wiaFormatGIF: FormatID,
-        wiaFormatJPEG: FormatID,
-        wiaFormatPNG: FormatID,
-        wiaFormatTIFF: FormatID
-    };
-
-    type Miscellaneous =
-        "'*'" //wiaAnyDeviceID
-        | "'{00000000-0000-0000-0000-000000000000}'"; //wiaIDUnknown
-    const Miscellaneous: {
-        wiaAnyDeviceID: Miscellaneous,
-        wiaIDUnknown: Miscellaneous
-    };
-
-    const enum WiaDeviceType {
-        CameraDeviceType = 2,
-        ScannerDeviceType = 1,
-        UnspecifiedDeviceType = 0,
-        VideoDeviceType = 3
-    }
-
-    const enum WiaEventFlag {
-        ActionEvent = 2,
-        NotificationEvent = 1
-    }
-
-    const enum WiaImageBias {
-        MaximizeQuality = 131072,
-        MinimizeSize = 65536
-    }
-
-    const enum WiaImageIntent {
-        ColorIntent = 1,
-        GrayscaleIntent = 2,
-        TextIntent = 4,
-        UnspecifiedIntent = 0
-    }
-
-    const enum WiaImagePropertyType {
-        ByteImagePropertyType = 1001,
-        LongImagePropertyType = 1004,
-        RationalImagePropertyType = 1006,
-        StringImagePropertyType = 1002,
-        UndefinedImagePropertyType = 1000,
-        UnsignedIntegerImagePropertyType = 1003,
-        UnsignedLongImagePropertyType = 1005,
-        UnsignedRationalImagePropertyType = 1007,
-        VectorOfBytesImagePropertyType = 1101,
-        VectorOfLongsImagePropertyType = 1103,
-        VectorOfRationalsImagePropertyType = 1105,
-        VectorOfUndefinedImagePropertyType = 1100,
-        VectorOfUnsignedIntegersImagePropertyType = 1102,
-        VectorOfUnsignedLongsImagePropertyType = 1104,
-        VectorOfUnsignedRationalsImagePropertyType = 1106
-    }
-
-    const enum WiaItemFlag {
-        AnalyzeItemFlag = 16,
-        AudioItemFlag = 32,
-        BurstItemFlag = 2048,
-        DeletedItemFlag = 128,
-        DeviceItemFlag = 64,
-        DisconnectedItemFlag = 256,
-        FileItemFlag = 2,
-        FolderItemFlag = 4,
-        FreeItemFlag = 0,
-        GeneratedItemFlag = 16384,
-        HasAttachmentsItemFlag = 32768,
-        HPanoramaItemFlag = 512,
-        ImageItemFlag = 1,
-        RemovedItemFlag = -2147483648,
-        RootItemFlag = 8,
-        StorageItemFlag = 4096,
-        TransferItemFlag = 8192,
-        VideoItemFlag = 65536,
-        VPanoramaItemFlag = 1024
-    }
-
-    const enum WiaPropertyType {
-        BooleanPropertyType = 1,
-        BytePropertyType = 2,
-        ClassIDPropertyType = 15,
-        CurrencyPropertyType = 12,
-        DatePropertyType = 13,
-        DoublePropertyType = 11,
-        ErrorCodePropertyType = 7,
-        FileTimePropertyType = 14,
-        HandlePropertyType = 18,
-        IntegerPropertyType = 3,
-        LargeIntegerPropertyType = 8,
-        LongPropertyType = 5,
-        ObjectPropertyType = 17,
-        SinglePropertyType = 10,
-        StringPropertyType = 16,
-        UnsignedIntegerPropertyType = 4,
-        UnsignedLargeIntegerPropertyType = 9,
-        UnsignedLongPropertyType = 6,
-        UnsupportedPropertyType = 0,
-        VariantPropertyType = 19,
-        VectorOfBooleansPropertyType = 101,
-        VectorOfBytesPropertyType = 102,
-        VectorOfClassIDsPropertyType = 115,
-        VectorOfCurrenciesPropertyType = 112,
-        VectorOfDatesPropertyType = 113,
-        VectorOfDoublesPropertyType = 111,
-        VectorOfErrorCodesPropertyType = 107,
-        VectorOfFileTimesPropertyType = 114,
-        VectorOfIntegersPropertyType = 103,
-        VectorOfLargeIntegersPropertyType = 108,
-        VectorOfLongsPropertyType = 105,
-        VectorOfSinglesPropertyType = 110,
-        VectorOfStringsPropertyType = 116,
-        VectorOfUnsignedIntegersPropertyType = 104,
-        VectorOfUnsignedLargeIntegersPropertyType = 109,
-        VectorOfUnsignedLongsPropertyType = 106,
-        VectorOfVariantsPropertyType = 119
-    }
-
-    const enum WiaSubType {
-        FlagSubType = 3,
-        ListSubType = 2,
-        RangeSubType = 1,
-        UnspecifiedSubType = 0
-    }
-
-    //Interfaces
-    interface CommonDialog {
-        ShowAcquireImage: (DeviceType?: WiaDeviceType, Intent?: WiaImageIntent, Bias?: WiaImageBias, FormatID?: string, AlwaysSelectDevice?: boolean, UseCommonUI?: boolean, CancelError?: boolean) => ImageFile;
-        ShowAcquisitionWizard: (Device: Device) => any;
-        ShowDeviceProperties: (Device: Device, CancelError?: boolean) => void;
-        ShowItemProperties: (Item: Item, CancelError?: boolean) => void;
-        ShowPhotoPrintingWizard: (Files: any) => void;
-        ShowSelectDevice: (DeviceType?: WiaDeviceType, AlwaysSelectDevice?: boolean, CancelError?: boolean) => Device;
-        ShowSelectItems: (Device: Device, Intent?: WiaImageIntent, Bias?: WiaImageBias, SingleSelect?: boolean, UseCommonUI?: boolean, CancelError?: boolean) => Items;
-        ShowTransfer: (Item: Item, FormatID?: string, CancelError?: boolean) => any;
-    }
-
-    interface Device {
-        Commands: DeviceCommands;
-        DeviceID: string;
-        Events: DeviceEvents;
-        ExecuteCommand: (CommandID: string) => Item;
-        GetItem: (ItemID: string) => Item;
-        Items: Items;
-        Properties: Properties;
-        Type: WiaDeviceType;
-        WiaItem: any /*VT_UNKNOWN*/;
-    }
-
-    interface DeviceCommand {
-        CommandID: string;
-        Description: string;
-        Name: string;
-    }
-
-    interface DeviceCommands {
-        Count: number;
-        Item: (Index: number) => DeviceCommand;
-    }
-
-    interface DeviceEvent {
-        Description: string;
-        EventID: string;
-        Name: string;
-        Type: WiaEventFlag;
-    }
-
-    interface DeviceEvents {
-        Count: number;
-        Item: (Index: number) => DeviceEvent;
-    }
-
-    interface DeviceInfo {
-        Connect: () => Device;
-        DeviceID: string;
-        Properties: Properties;
-        Type: WiaDeviceType;
-    }
-
-    interface DeviceInfos {
-        Count: number;
-        Item: (Index: any) => DeviceInfo;
-    }
-
-    interface DeviceManager {
-        DeviceInfos: DeviceInfos;
-        RegisterEvent: (EventID: string, DeviceID?: string) => void;
-        RegisterPersistentEvent: (Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string) => void;
-        UnregisterEvent: (EventID: string, DeviceID?: string) => void;
-        UnregisterPersistentEvent: (Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string) => void;
-    }
-
-    interface Filter {
-        Description: string;
-        FilterID: string;
-        Name: string;
-        Properties: Properties;
-    }
-
-    interface FilterInfo {
-        Description: string;
-        FilterID: string;
-        Name: string;
-    }
-
-    interface FilterInfos {
-        Count: number;
-        Item: (Index: any) => FilterInfo;
-    }
-
-    interface Filters {
-        Add: (FilterID: string, Index?: number) => void;
-        Count: number;
-        Item: (Index: number) => Filter;
-        Remove: (Index: number) => void;
-    }
-
-    interface Formats {
-        Count: number;
-        Item: (Index: number) => string;
-    }
-
-    interface ImageFile {
-        ActiveFrame: number;
-        ARGBData: Vector;
-        FileData: Vector;
-        FileExtension: string;
-        FormatID: string;
-        FrameCount: number;
-        Height: number;
-        HorizontalResolution: number;
-        IsAlphaPixelFormat: boolean;
-        IsAnimated: boolean;
-        IsExtendedPixelFormat: boolean;
-        IsIndexedPixelFormat: boolean;
-        LoadFile: (Filename: string) => void;
-        PixelDepth: number;
-        Properties: Properties;
-        SaveFile: (Filename: string) => void;
-        VerticalResolution: number;
-        Width: number;
-    }
-
-    interface ImageProcess {
-        Apply: (Source: ImageFile) => ImageFile;
-        FilterInfos: FilterInfos;
-        Filters: Filters;
-    }
-
-    interface Item {
-        Commands: DeviceCommands;
-        ExecuteCommand: (CommandID: string) => Item;
-        Formats: Formats;
-        ItemID: string;
-        Items: Items;
-        Properties: Properties;
-        Transfer: (FormatID?: string) => any;
-        WiaItem: any /*VT_UNKNOWN*/;
-    }
-
-    interface Items {
-        Add: (Name: string, Flags: number) => void;
-        Count: number;
-        Item: (Index: number) => Item;
-        Remove: (Index: number) => void;
-    }
-
-    interface Properties {
-        Count: number;
-        Exists: (Index: any) => boolean;
-        Item: (Index: any) => Property;
-    }
-
-    interface Property {
-        IsReadOnly: boolean;
-        IsVector: boolean;
-        Name: string;
-        PropertyID: number;
-        SubType: WiaSubType;
-        SubTypeDefault: any;
-        SubTypeMax: number;
-        SubTypeMin: number;
-        SubTypeStep: number;
-        SubTypeValues: Vector;
-        Type: number;
-        Value: any;
-    }
-
-    interface Rational {
-        Denominator: number;
-        Numerator: number;
-        Value: number;
-    }
-
-    interface Vector {
-        Add: (Value: any, Index?: number) => void;
-        BinaryData: any;
-        Clear: () => void;
-        Count: number;
-        Date: VarDate;
-        ImageFile: (Width?: number, Height?: number) => ImageFile;
-        Item: (Index: number) => any;   //Also has setter with parameters
-        Picture: (Width?: number, Height?: number) => any;
-        Remove: (Index: number) => any;
-        SetFromString: (Value: string, Resizable?: boolean, Unicode?: boolean) => void;
-        String: (Unicode?: boolean) => string;
-    }
-
-}
-
-interface ActiveXObject {
-    new (progID: 'WIA.Rational'): WIA.Rational;
-    new (progID: 'WIA.Vector'): WIA.Vector;
-    new (progID: 'WIA.ImageFile'): WIA.ImageFile;
-    new (progID: 'WIA.ImageProcess'): WIA.ImageProcess;
-    new (progID: 'WIA.CommonDialog'): WIA.CommonDialog;
-    new (progID: 'WIA.DeviceManager'): WIA.DeviceManager;
-}
-

From 8532f27673f13da5a70ceb3ea53394550c4b0363 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 25 Jun 2017 17:07:59 -0400
Subject: [PATCH 032/287] [jquery] Add more tests for JQueryStatic.when().

---
 types/jquery/jquery-tests.ts | 58 +++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 478e1390a4..376eaa51f6 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4607,11 +4607,61 @@ function JQueryStatic() {
             }
         }
 
-        // $ExpectType Promise<string, any, any>
-        $.when($.Deferred<string>());
+        function Promise() {
+            const w = $.when($.Deferred<string, Error, number>());
 
-        // $ExpectType Promise<never, never, never>
-        $.when();
+            w.then(value => {
+                // $ExpectType string
+                value;
+            });
+
+            w.catch(reason => {
+                // $ExpectType Error
+                reason;
+            });
+
+            w.then(null, null, value => {
+                // $ExpectType number
+                value;
+            });
+        }
+
+        function Thenable() {
+            const w = $.when($.Deferred<string>());
+
+            w.then(value => {
+                // $ExpectType string
+                value;
+            });
+        }
+
+        function value() {
+            const w = $.when('myVal1');
+
+            w.then(value => {
+                // $ExpectType string
+                value;
+            });
+        }
+
+        function Zero() {
+            const w = $.when();
+
+            w.then((value) => {
+                // $ExpectType never
+                value;
+            });
+
+            w.catch((reason) => {
+                // $ExpectType never
+                reason;
+            });
+
+            w.then(null, null, (value) => {
+                // $ExpectType never
+                value;
+            });
+        }
 
         // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/2725
         function issue_2725() {

From 6adf912c3844c7f735cb6b6cfb479d8b28636059 Mon Sep 17 00:00:00 2001
From: Alan Marcell <alanmarcell@live.com>
Date: Sun, 25 Jun 2017 18:32:48 -0300
Subject: [PATCH 033/287] Add mongodb Collection.replaceOne(...) return type
 WriteOpResult

In case of Collection.replaceOne(..., {upsert:true}) the return type is an WriteOpResult
---
 types/mongodb/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 18e627ebfc..aee64a729c 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for MongoDB v2.2
 // Project: https://github.com/mongodb/node-mongodb-native/tree/2.2
 // Definitions by: Federico Caselli <https://github.com/CaselIT>
+//                 Alan Marcell <https://github.com/alanmarcell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -585,9 +586,9 @@ export interface Collection<TSchema = Default> {
     rename(newName: string, callback: MongoCallback<Collection<TSchema>>): void;
     rename(newName: string, options?: { dropTarget?: boolean }): Promise<Collection<TSchema>>;
     rename(newName: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection<TSchema>>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#replaceOne
+    //http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#replaceOne
     replaceOne(filter: Object, doc: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
-    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
+    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult> | Promise<WriteOpResult>;
     replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#save
     /** @deprecated Use insertOne, insertMany, updateOne or updateMany */

From b3ce2941b4ebd10d46846a3de29e5f3b06c7bc21 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Mon, 26 Jun 2017 07:59:11 +0200
Subject: [PATCH 034/287] Fixed whitespace after header

---
 types/activex-adodb/index.d.ts     |  6 ++---
 types/activex-scripting/index.d.ts | 37 +-----------------------------
 types/activex-wia/index.d.ts       | 32 ++++++++++++--------------
 3 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 8d6190363a..0fe592c2d8 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for ADODB - 
+// Type definitions for ADODB
 // Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
 // Defintions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 declare namespace ADODB {
 
-    //Enums
     const enum ADCPROP_ASYNCTHREADPRIORITY_ENUM {
         adPriorityAboveNormal = 4,
         adPriorityBelowNormal = 2,
@@ -594,7 +594,6 @@ declare namespace ADODB {
         adXactSyncPhaseOne = 1048576
     }
 
-    //Interfaces
     interface Command {
         ActiveConnection: Connection;
         Cancel(): void;
@@ -947,7 +946,6 @@ declare namespace ADODB {
 
 }
 
-//Global interfaces
 interface ActiveXObject {
     on(obj: ADODB.Connection, eventName: 'BeginTransComplete', eventArgs: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {TransactionLevel: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
     on(obj: ADODB.Connection, eventName: 'CommitTransComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index 55bf6bd661..4eafd1f924 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -2,42 +2,9 @@
 // Project: https://msdn.microsoft.com/en-us/library/bstcxhf7.aspx
 // Defintions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 declare namespace Scripting {
 
-    //Enums
-    const enum __MIDL___MIDL_itf_scrrun_0000_0000_0001 {
-        Alias = 1024,
-        Archive = 32,
-        Compressed = 2048,
-        Directory = 16,
-        Hidden = 2,
-        Normal = 0,
-        ReadOnly = 1,
-        System = 4,
-        Volume = 8
-    }
-
-    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0001 {
-        CDRom = 4,
-        Fixed = 2,
-        RamDisk = 5,
-        Remote = 3,
-        Removable = 1,
-        UnknownType = 0
-    }
-
-    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0002 {
-        SystemFolder = 1,
-        TemporaryFolder = 2,
-        WindowsFolder = 0
-    }
-
-    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0003 {
-        StdErr = 2,
-        StdIn = 0,
-        StdOut = 1
-    }
-
     const enum CompareMethod {
         BinaryCompare = 0,
         DatabaseCompare = 2,
@@ -90,7 +57,6 @@ declare namespace Scripting {
         TristateUseDefault = -2
     }
 
-    //Interfaces
     /** Scripting.Dictionary */
     interface Dictionary {
         
@@ -496,7 +462,6 @@ declare namespace Scripting {
 
 }
 
-//Global interfaces
 interface ActiveXObject {
     set(obj: Scripting.Dictionary, propertyName: 'Item', parameterTypes: [any], newValue: any): void;
     new(progid: 'Scripting.Dictionary'): Scripting.Dictionary;
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index d79adff2a4..46f1f285af 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -1,11 +1,11 @@
-// Type definitions for WIA - 
-// Project: 
+// Type definitions for WIA
+// Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms630368(v=vs.85).aspx
 // Defintions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 declare namespace WIA {
 
-    //Enums
-        /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */
+    /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */
     const enum CommandID {
         wiaCommandChangeDocument = '{04E725B0-ACAE-11D2-A093-00C04F72DC3C}',
         wiaCommandDeleteAllItems = '{E208C170-ACAD-11D2-A093-00C04F72DC3C}',
@@ -14,7 +14,7 @@ declare namespace WIA {
         wiaCommandUnloadDocument = '{1F3B3D8E-ACAE-11D2-A093-00C04F72DC3C}'
     }
 
-        /** String versions of globally unique identifiers (GUIDs) that identify DeviceManager events. */
+    /** String versions of globally unique identifiers (GUIDs) that identify DeviceManager events. */
     const enum EventID {
         wiaEventDeviceConnected = '{A28BBADE-64B6-11D2-A231-00C04FA31809}',
         wiaEventDeviceDisconnected = '{143E4E83-6497-11D2-A231-00C04FA31809}',
@@ -31,7 +31,7 @@ declare namespace WIA {
         wiaEventScanPrintImage = '{B441F425-8C6E-11D2-977A-0000F87A926F}'
     }
 
-        /** String versions of globally unique identifiers (GUIDs) that indicate the file format of an image. */
+    /** String versions of globally unique identifiers (GUIDs) that indicate the file format of an image. */
     const enum FormatID {
         wiaFormatBMP = '{B96B3CAB-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatGIF = '{B96B3CB0-0728-11D3-9D7B-0000F81EF32E}',
@@ -40,13 +40,13 @@ declare namespace WIA {
         wiaFormatTIFF = '{B96B3CB1-0728-11D3-9D7B-0000F81EF32E}'
     }
 
-        /** Miscellaneous string constants */
+    /** Miscellaneous string constants */
     const enum Miscellaneous {
         wiaAnyDeviceID = '*',
         wiaIDUnknown = '{00000000-0000-0000-0000-000000000000}'
     }
 
-        /** The WiaDeviceType enumeration specifies the type of device attached to a user's computer. Use the Type property on the DeviceInfo object or the Device object to obtain these values from the device. */
+    /** The WiaDeviceType enumeration specifies the type of device attached to a user's computer. Use the Type property on the DeviceInfo object or the Device object to obtain these values from the device. */
     const enum WiaDeviceType {
         CameraDeviceType = 2,
         ScannerDeviceType = 1,
@@ -54,19 +54,19 @@ declare namespace WIA {
         VideoDeviceType = 3
     }
 
-        /** A DeviceEvent's type is composed of bits from the WiaEventFlags enumeration. You can test a DeviceEvent's type by using the AND operation with DeviceEvent.Type and a member from the WiaEventFlags enumeration. */
+    /** A DeviceEvent's type is composed of bits from the WiaEventFlags enumeration. You can test a DeviceEvent's type by using the AND operation with DeviceEvent.Type and a member from the WiaEventFlags enumeration. */
     const enum WiaEventFlag {
         ActionEvent = 2,
         NotificationEvent = 1
     }
 
-        /** The WiaImageBias enumeration helps specify what type of data the image is intended to represent. */
+    /** The WiaImageBias enumeration helps specify what type of data the image is intended to represent. */
     const enum WiaImageBias {
         MaximizeQuality = 131072,
         MinimizeSize = 65536
     }
 
-        /** The WiaImageIntent enumeration helps specify what type of data the image is intended to represent. */
+    /** The WiaImageIntent enumeration helps specify what type of data the image is intended to represent. */
     const enum WiaImageIntent {
         ColorIntent = 1,
         GrayscaleIntent = 2,
@@ -74,7 +74,7 @@ declare namespace WIA {
         UnspecifiedIntent = 0
     }
 
-        /** The WiaImagePropertyType enumeration specifies the type of the value of an image property. Image properties can be found in the Properties collection of an ImageFile object. */
+    /** The WiaImagePropertyType enumeration specifies the type of the value of an image property. Image properties can be found in the Properties collection of an ImageFile object. */
     const enum WiaImagePropertyType {
         ByteImagePropertyType = 1001,
         LongImagePropertyType = 1004,
@@ -93,7 +93,7 @@ declare namespace WIA {
         VectorOfUnsignedRationalsImagePropertyType = 1106
     }
 
-        /** An Item's type is composed of bits from the WiaItemFlags enumeration. You can test an Item's type by using the AND operation with Item.Properties("Item Flags") and a member from the WiaItemFlags enumeration. */
+    /** An Item's type is composed of bits from the WiaItemFlags enumeration. You can test an Item's type by using the AND operation with Item.Properties("Item Flags") and a member from the WiaItemFlags enumeration. */
     const enum WiaItemFlag {
         AnalyzeItemFlag = 16,
         AudioItemFlag = 32,
@@ -116,7 +116,7 @@ declare namespace WIA {
         VPanoramaItemFlag = 1024
     }
 
-        /** The WiaPropertyType enumeration specifies the type of the value of an item property. Item properties can be found in the Properties collection of a Device or Item object. */
+    /** The WiaPropertyType enumeration specifies the type of the value of an item property. Item properties can be found in the Properties collection of a Device or Item object. */
     const enum WiaPropertyType {
         BooleanPropertyType = 1,
         BytePropertyType = 2,
@@ -157,7 +157,7 @@ declare namespace WIA {
         VectorOfVariantsPropertyType = 119
     }
 
-        /** The WiaSubType enumeration specifies more detail about the property value. Use the SubType property on the Property object to obtain these values for the property. */
+    /** The WiaSubType enumeration specifies more detail about the property value. Use the SubType property on the Property object to obtain these values for the property. */
     const enum WiaSubType {
         FlagSubType = 3,
         ListSubType = 2,
@@ -165,7 +165,6 @@ declare namespace WIA {
         UnspecifiedSubType = 0
     }
 
-    //Interfaces
     /** The CommonDialog control is an invisible-at-runtime control that contains all the methods that display a User Interface. A CommonDialog control can be created using "WIA.CommonDialog" in a call to CreateObject or by dropping a CommonDialog on a form. */
     interface CommonDialog {
         
@@ -671,7 +670,6 @@ declare namespace WIA {
 
 }
 
-//Global interfaces
 interface ActiveXObject {
     on(obj: WIA.DeviceManager, eventName: 'OnEvent', eventArgs: ['EventID', 'DeviceID', 'ItemID'], handler: (this: WIA.DeviceManager, parameter: {EventID: string, DeviceID: string, ItemID: string}) => void): void;
     set(obj: WIA.Vector, propertyName: 'Item', parameterTypes: [number], newValue: any): void;

From a5216b75cbd88c52ac8433fae2473c4bae187d7c Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Mon, 26 Jun 2017 08:31:56 +0200
Subject: [PATCH 035/287] Fixed spelling of "Defintions"

---
 types/activex-adodb/index.d.ts     | 4 ++--
 types/activex-scripting/index.d.ts | 4 ++--
 types/activex-wia/index.d.ts       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 0fe592c2d8..8d27b7c706 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for ADODB
+// Type definitions for Microsoft ActiveX Data Objects
 // Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
-// Defintions by: Zev Spitz <https://github.com/zspitz>
+// Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ADODB {
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index 4eafd1f924..7911113175 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Scripting - 
+// Type definitions for Microsoft Scripting Runtime
 // Project: https://msdn.microsoft.com/en-us/library/bstcxhf7.aspx
-// Defintions by: Zev Spitz <https://github.com/zspitz>
+// Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Scripting {
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index 46f1f285af..266902a683 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for WIA
+// Type definitions for Windows Image Acquisition
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms630368(v=vs.85).aspx
-// Defintions by: Zev Spitz <https://github.com/zspitz>
+// Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace WIA {

From de094e27e520b991e90d286c3d6e959c5ce0ef95 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Mon, 26 Jun 2017 08:36:54 +0200
Subject: [PATCH 036/287] Removed extra file

---
 types/activex-scripting/activex-scripting.ts | 64 --------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 types/activex-scripting/activex-scripting.ts

diff --git a/types/activex-scripting/activex-scripting.ts b/types/activex-scripting/activex-scripting.ts
deleted file mode 100644
index 1510b98e1b..0000000000
--- a/types/activex-scripting/activex-scripting.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-//source -- https://msdn.microsoft.com/en-us/library/ebkhfaaz.aspx
-
-
-//Generates a string describing the drive type of a given Drive object.
-var showDriveType = (drive: Scripting.Drive) => {
-    switch (drive.DriveType) {
-        case Scripting.DriveTypeConst.Removable:
-            return 'Removeable';
-        case Scripting.DriveTypeConst.Fixed:
-            return 'Fixecd';
-        case Scripting.DriveTypeConst.Remote:
-            return 'Network';
-        case Scripting.DriveTypeConst.CDRom:
-            return 'CD-ROM';
-        case Scripting.DriveTypeConst.RamDisk:
-            return 'RAM Disk';
-        default:
-            return 'Unknown';
-    }
-};
-
-
-//Generates a string describing the attributes of a file or folder.
-var showFileAttributes = (file: Scripting.File) => {
-    var attr = file.Attributes;
-    if (attr === 0) {
-        return 'Normal';
-    }
-    var attributeStrings: string[] = [];
-    if (attr & Scripting.FileAttribute.Directory) { attributeStrings.push('Directory'); }
-    if (attr & Scripting.FileAttribute.ReadOnly) { attributeStrings.push('Read-only'); }
-    if (attr & Scripting.FileAttribute.Hidden) { attributeStrings.push('Hidden'); }
-    if (attr & Scripting.FileAttribute.System) { attributeStrings.push('System'); }
-    if (attr & Scripting.FileAttribute.Volume) { attributeStrings.push('Volume'); }
-    if (attr & Scripting.FileAttribute.Archive) { attributeStrings.push('Archive'); }
-    if (attr & Scripting.FileAttribute.Alias) { attributeStrings.push('Alias'); }
-    if (attr & Scripting.FileAttribute.Compressed) { attributeStrings.push('Compressed'); }
-    return attributeStrings.join(',');
-};
-
-
-//source --https://msdn.microsoft.com/en-us/library/ts2t8ybh(v=vs.84).aspx
-var showFreeSpace = (drvPath: string) => {
-    var fso = new ActiveXObject('Scripting.FileSystemObject');
-    var d = fso.GetDrive(fso.GetDriveName(drvPath));
-    var s = 'Drive ' + drvPath + ' - ';
-    s += d.VolumeName + '<br>';
-    s += 'Free Space: ' + d.FreeSpace / 1024 + ' Kbytes';
-    return (s);
-};
-
-
-//source -- https://msdn.microsoft.com/en-us/library/kaf6yaft(v=vs.84).aspx
-var getALine = (filespec: string) => {
-    var fso = new ActiveXObject('Scripting.FileSystemObject');
-    var file = fso.OpenTextFile(filespec, Scripting.IOMode.ForReading, false);
-
-    var s = '';
-    while (!file.AtEndOfLine) {
-        s += file.Read(1);
-    }
-    file.Close();
-    return (s);
-};

From 5e86ce784cdea8f7e0036f8957b4e4b53b2c0d67 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Mon, 26 Jun 2017 08:42:34 +0200
Subject: [PATCH 037/287] Fixed tslint.json whitespace

---
 types/activex-adodb/tslint.json     | 2 +-
 types/activex-scripting/tslint.json | 2 +-
 types/activex-wia/tslint.json       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/activex-adodb/tslint.json b/types/activex-adodb/tslint.json
index 1d0e17119e..2750cc0197 100644
--- a/types/activex-adodb/tslint.json
+++ b/types/activex-adodb/tslint.json
@@ -1 +1 @@
-{ "extends": "dtslint / dt.json" }
\ No newline at end of file
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/activex-scripting/tslint.json b/types/activex-scripting/tslint.json
index 1d0e17119e..2750cc0197 100644
--- a/types/activex-scripting/tslint.json
+++ b/types/activex-scripting/tslint.json
@@ -1 +1 @@
-{ "extends": "dtslint / dt.json" }
\ No newline at end of file
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/activex-wia/tslint.json b/types/activex-wia/tslint.json
index 1d0e17119e..2750cc0197 100644
--- a/types/activex-wia/tslint.json
+++ b/types/activex-wia/tslint.json
@@ -1 +1 @@
-{ "extends": "dtslint / dt.json" }
\ No newline at end of file
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From dc164b94fb06f67ff0423d2592407e9a07599c3e Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Mon, 26 Jun 2017 09:16:01 +0200
Subject: [PATCH 038/287] Fixed tsconfig.json

---
 types/activex-adodb/tsconfig.json     | 3 +++
 types/activex-scripting/tsconfig.json | 3 +++
 types/activex-wia/tsconfig.json       | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/types/activex-adodb/tsconfig.json b/types/activex-adodb/tsconfig.json
index 22b6f9e045..01ef1659e1 100644
--- a/types/activex-adodb/tsconfig.json
+++ b/types/activex-adodb/tsconfig.json
@@ -3,6 +3,9 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": ["scripthost"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strict": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/activex-scripting/tsconfig.json b/types/activex-scripting/tsconfig.json
index badf87e17e..454fc20695 100644
--- a/types/activex-scripting/tsconfig.json
+++ b/types/activex-scripting/tsconfig.json
@@ -3,6 +3,9 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": ["scripthost"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strict": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/activex-wia/tsconfig.json b/types/activex-wia/tsconfig.json
index 70a07b894d..321e40e36c 100644
--- a/types/activex-wia/tsconfig.json
+++ b/types/activex-wia/tsconfig.json
@@ -3,6 +3,9 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": ["scripthost"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strict": true,
         "baseUrl": "../",
         "typeRoots": [

From 5c937ddfaa9733013ab88320dc907199c5015c31 Mon Sep 17 00:00:00 2001
From: Diogo Franco <diogomfranco@gmail.com>
Date: Mon, 26 Jun 2017 17:18:19 +0900
Subject: [PATCH 039/287] flux-standard-action: fix typos, declare assertions

---
 types/flux-standard-action/index.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/flux-standard-action/index.d.ts b/types/flux-standard-action/index.d.ts
index d5393e0ace..388132bea6 100644
--- a/types/flux-standard-action/index.d.ts
+++ b/types/flux-standard-action/index.d.ts
@@ -5,7 +5,7 @@
 
 
 export interface ErrorAction extends Action<Error> {
-    error: boolean;
+    error: true;
 }
 
 export interface Action<T> {
@@ -14,16 +14,16 @@ export interface Action<T> {
     error?: boolean;
 }
 
-// Usage: var action: Action<sring> & AnyMeta;
+/** Usage: `var action: Action<string> & AnyMeta;` */
 export interface AnyMeta {
     meta: any
 }
 
-// Usage: var action: Action<sring> & TypedMeta<string>;
+/** Usage: `var action: Action<string> & TypedMeta<string>;` */
 export interface TypedMeta<T> {
     meta: T
 }
 
-export declare function isFSA(action: any): boolean;
+export declare function isFSA(action: any): action is Action<any>;
 
-export declare function isError(action: any): boolean;
+export declare function isError(action: any): action is ErrorAction;

From 9c494ba02efd1358bdf43f1c0f988cc0598e3ad7 Mon Sep 17 00:00:00 2001
From: Diogo Franco <diogomfranco@gmail.com>
Date: Mon, 26 Jun 2017 17:25:49 +0900
Subject: [PATCH 040/287] Update flux-standard-action-tests.ts

---
 .../flux-standard-action-tests.ts                  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/types/flux-standard-action/flux-standard-action-tests.ts b/types/flux-standard-action/flux-standard-action-tests.ts
index 5934e56fb8..1a98c6663c 100644
--- a/types/flux-standard-action/flux-standard-action-tests.ts
+++ b/types/flux-standard-action/flux-standard-action-tests.ts
@@ -23,3 +23,17 @@ var result1: boolean = isError(sample1);
 var result2: boolean = isFSA(sample1);
 var result3: boolean = isError(sample2);
 var result4: boolean = isFSA(sample2);
+
+declare function alert (message: string): void
+
+function unwrapAction(action: { type: string }) {
+    if (isFSA(action)) {
+        if (isError(action)) {
+            alert(action.payload!.message)
+        }
+        return action.payload
+    }
+}
+
+var result5: TextPayload = unwrapAction(sample1)
+var result6: Error = unwrapAction(sample2)

From 1331945eeac8aa15757ec697b8fa91f8f2e224af Mon Sep 17 00:00:00 2001
From: YairTawil <yairtawil@gmail.com>
Date: Mon, 26 Jun 2017 14:32:00 +0300
Subject: [PATCH 041/287] fix unit testing

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

diff --git a/types/wellknown/index.d.ts b/types/wellknown/index.d.ts
index a79f3236bf..41a751c2d1 100644
--- a/types/wellknown/index.d.ts
+++ b/types/wellknown/index.d.ts
@@ -3,10 +3,5 @@
 // Definitions by: Yair Tawil <https://github.com/yairtawil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export = wellknown;
-
-declare namespace wellknown {
-    function parse(input: string): object;
-    function stringify(gj: {}): string;
-}
-
+export declare function parse(input: string): {};
+export declare function stringify(gj: {}): string;
diff --git a/types/wellknown/wellknown-tests.ts b/types/wellknown/wellknown-tests.ts
index 7106927b88..0f1bcd656e 100644
--- a/types/wellknown/wellknown-tests.ts
+++ b/types/wellknown/wellknown-tests.ts
@@ -1,4 +1,4 @@
-import * as wellknown from './index';
+import * as wellknown from 'wellknown';
 wellknown.parse("POINT(1 2)");
 const geoJson: {} = {
     coordinates: [1, 2],

From 2ff6e2cad4b110ddaa082b21bc556b1e04dfff5b Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 08:00:00 -0400
Subject: [PATCH 042/287] [jquery] offset() can return undefined on empty sets.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 316e631b9d..9e6a67e440 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -1368,7 +1368,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/offset/}
      * @since 1.2
      */
-    offset(): JQuery.Coordinates;
+    offset(): JQuery.Coordinates | undefined;
     /**
      * Get the closest ancestor element that is positioned.
      *
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 376eaa51f6..e2cea8ba54 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -601,7 +601,7 @@ function JQuery() {
                 };
             });
 
-            // $ExpectType Coordinates
+            // $ExpectType Coordinates | undefined
             $('p').offset();
         }
 
diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
index f59f8a3acc..0c871de0a7 100644
--- a/types/jquery/test/example-tests.ts
+++ b/types/jquery/test/example-tests.ts
@@ -3754,13 +3754,13 @@ function examples() {
 
     function offset_0() {
         var p = $('p:last');
-        var offset = p.offset();
+        var offset = p.offset()!;
         p.html('left: ' + offset.left + ', top: ' + offset.top);
     }
 
     function offset_1() {
         $('*', document.body).click(function(event) {
-            var offset = $(this).offset();
+            var offset = $(this).offset()!;
             event.stopPropagation();
             $('#result').text(this.tagName +
                 ' coords ( ' + offset.left + ', ' + offset.top + ' )');

From ad4c226d12fdbd2dd221d3de2356b9364fdb98c7 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 08:05:35 -0400
Subject: [PATCH 043/287] [jquery] Add @deprecated to ready().

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 9e6a67e440..e99260c2de 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -1793,6 +1793,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @param handler A function to execute after the DOM is ready.
      * @see {@link https://api.jquery.com/ready/}
      * @since 1.0
+     * @deprecated 3.0
      */
     ready(handler: ($: JQueryStatic<TElement>) => void): this;
     /**

From b986d024e184a0f17790b937401dd0033febe38b Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 08:16:18 -0400
Subject: [PATCH 044/287] [jquery] Add Deferred.exceptionHook.

---
 types/jquery/index.d.ts      | 29 ++++++++-------
 types/jquery/jquery-tests.ts | 70 +++++++++++++++++++-----------------
 2 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index e99260c2de..64111d5b69 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -2395,6 +2395,16 @@ interface JQuery<TElement extends Node = HTMLElement> {
 interface JQuery<TElement extends Node = HTMLElement> extends ArrayLike<TElement>, Iterable<TElement> { }
 
 interface JQueryStatic<TElement extends Node = HTMLElement> {
+    /**
+     * A factory function that returns a chainable utility object with methods to register multiple
+     * callbacks into callback queues, invoke callback queues, and relay the success or failure state of
+     * any synchronous or asynchronous function.
+     *
+     * @param beforeStart A function that is called just before the constructor returns.
+     * @see {@link https://api.jquery.com/jQuery.Deferred/}
+     * @since 1.5
+     */
+    Deferred: JQuery.DeferredStatic;
     Event: JQuery.EventStatic<TElement>;
     /**
      * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize
@@ -2501,19 +2511,6 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @since 1.7
      */
     Callbacks<T extends Function>(flags?: string): JQuery.Callbacks<T>;
-    /**
-     * A factory function that returns a chainable utility object with methods to register multiple
-     * callbacks into callback queues, invoke callback queues, and relay the success or failure state of
-     * any synchronous or asynchronous function.
-     *
-     * @param beforeStart A function that is called just before the constructor returns.
-     * @see {@link https://api.jquery.com/jQuery.Deferred/}
-     * @since 1.5
-     */
-    Deferred<TResolve = any,
-        TReject = any,
-        TNotify = any>(beforeStart?: (this: JQuery.Deferred<TResolve, TReject, TNotify>,
-                                      deferred: JQuery.Deferred<TResolve, TReject, TNotify>) => void): JQuery.Deferred<TResolve, TReject, TNotify>;
     /**
      * Perform an asynchronous HTTP (Ajax) request.
      *
@@ -4268,6 +4265,12 @@ declare namespace JQuery {
      */
     interface Thenable<T> extends PromiseLike<T> { }
 
+    interface DeferredStatic {
+        // https://jquery.com/upgrade-guide/3.0/#callback-exit
+        exceptionHook: any;
+        <TR = any, TJ = any, TN = any>(beforeStart?: (this: JQuery.Deferred<TR, TJ, TN>, deferred: JQuery.Deferred<TR, TJ, TN>) => void): JQuery.Deferred<TR, TJ, TN>;
+    }
+
     interface Deferred<TR, TJ = any, TN = any> {
         /**
          * Add handlers to be called when the Deferred object is either resolved or rejected.
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index e2cea8ba54..8a6710a2fd 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3592,49 +3592,55 @@ function JQueryStatic() {
     }
 
     function Deferred() {
-        // #ExpectType Deferred<boolean, string, number>
-        $.Deferred<boolean, string, number>(function(deferred) {
+        function call_signature() {
             // #ExpectType Deferred<boolean, string, number>
-            this;
+            $.Deferred<boolean, string, number>(function(deferred) {
+                // #ExpectType Deferred<boolean, string, number>
+                this;
+                // #ExpectType Deferred<boolean, string, number>
+                deferred;
+            });
+
             // #ExpectType Deferred<boolean, string, number>
-            deferred;
-        });
+            $.Deferred<boolean, string, number>();
 
-        // #ExpectType Deferred<boolean, string, number>
-        $.Deferred<boolean, string, number>();
-
-        // #ExpectType Deferred<boolean, string, any>
-        $.Deferred<boolean, string>(function(deferred) {
             // #ExpectType Deferred<boolean, string, any>
-            this;
+            $.Deferred<boolean, string>(function(deferred) {
+                // #ExpectType Deferred<boolean, string, any>
+                this;
+                // #ExpectType Deferred<boolean, string, any>
+                deferred;
+            });
+
             // #ExpectType Deferred<boolean, string, any>
-            deferred;
-        });
+            $.Deferred<boolean, string>();
 
-        // #ExpectType Deferred<boolean, string, any>
-        $.Deferred<boolean, string>();
-
-        // #ExpectType Deferred<boolean, any, any>
-        $.Deferred<boolean>(function(deferred) {
             // #ExpectType Deferred<boolean, any, any>
-            this;
+            $.Deferred<boolean>(function(deferred) {
+                // #ExpectType Deferred<boolean, any, any>
+                this;
+                // #ExpectType Deferred<boolean, any, any>
+                deferred;
+            });
+
             // #ExpectType Deferred<boolean, any, any>
-            deferred;
-        });
+            $.Deferred<boolean>();
 
-        // #ExpectType Deferred<boolean, any, any>
-        $.Deferred<boolean>();
-
-        // #ExpectType Deferred<any, any, any>
-        $.Deferred(function(deferred) {
             // #ExpectType Deferred<any, any, any>
-            this;
-            // #ExpectType Deferred<any, any, any>
-            deferred;
-        });
+            $.Deferred(function(deferred) {
+                // #ExpectType Deferred<any, any, any>
+                this;
+                // #ExpectType Deferred<any, any, any>
+                deferred;
+            });
 
-        // #ExpectType Deferred<any, any, any>
-        $.Deferred();
+            // #ExpectType Deferred<any, any, any>
+            $.Deferred();
+        }
+
+        function exceptionHook() {
+            $.Deferred.exceptionHook = undefined;
+        }
     }
 
     function ajax() {

From 79746b418281b8fc67b5dfbdfb253a6f7ce2f9ef Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 09:19:18 -0400
Subject: [PATCH 045/287] [jquery] when() does not emit progress notifications.

---
 types/jquery/index.d.ts      |  58 +++++------
 types/jquery/jquery-tests.ts | 192 +++++++++++++++++++++++------------
 2 files changed, 152 insertions(+), 98 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 64111d5b69..bae24d9780 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3273,9 +3273,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
     when<TR1, TJ1 = any, TN1 = any,
         UR1 = any, UJ1 = any, UN1 = any,
         VR1 = any, VJ1 = any, VN1 = any>
-        (deferredT: TR1 | JQuery.Thenable<TR1> | JQuery.Promise<TR1, TJ1, TN1>,
-         deferredU: UR1 | JQuery.Thenable<UR1> | JQuery.Promise<UR1, UJ1, UN1>,
-         deferredV: VR1 | JQuery.Thenable<VR1> | JQuery.Promise<VR1, VJ1, VN1>): JQuery.Promise3<TR1, TJ1, TN1, UR1, UJ1, UN1, VR1, VJ1, VN1>;
+        (deferredT: JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1,
+         deferredU: JQuery.Promise<UR1, UJ1, UN1> | JQuery.Thenable<UR1> | UR1,
+         deferredV: JQuery.Promise<VR1, VJ1, VN1> | JQuery.Thenable<VR1> | VR1): JQuery.Promise3<TR1, TJ1, never,
+        UR1, UJ1, never,
+        VR1, VJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3292,14 +3294,14 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
         VR1 = never, VJ1 = never, VN1 = never,
         VR2 = never, VJ2 = never, VN2 = never,
         VR3 = never, VJ3 = never, VN3 = never>
-        (deferredT: JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2> |
-             JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3>,
-         deferredU: JQuery.Promise2<UR1, UJ1, UN1, UR2, UJ2, UN2> |
-             JQuery.Promise3<UR1, UJ1, UN1, UR2, UJ2, UN2, UR3, UJ3, UN3>,
-         deferredV: JQuery.Promise2<VR1, VJ1, VN1, VR2, VJ2, VN2> |
-             JQuery.Promise3<VR1, VJ1, VN1, VR2, VJ2, VN2, VR3, VJ3, VN3>): JQuery.Promise3<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], [TN1, TN2, TN3],
-        [UR1, UR2, UR3], [UJ1, UJ2, UJ3], [UN1, UN2, UN3],
-        [VR1, VR2, VR3], [VJ1, VJ2, VJ3], [VN1, VN2, VN3]>;
+        (deferredT: JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3> |
+             JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>,
+         deferredU: JQuery.Promise3<UR1, UJ1, UN1, UR2, UJ2, UN2, UR3, UJ3, UN3> |
+             JQuery.Promise2<UR1, UJ1, UN1, UR2, UJ2, UN2>,
+         deferredV: JQuery.Promise3<VR1, VJ1, VN1, VR2, VJ2, VN2, VR3, VJ3, VN3> |
+             JQuery.Promise2<VR1, VJ1, VN1, VR2, VJ2, VN2>): JQuery.Promise3<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], never,
+        [UR1, UR2, UR3], [UJ1, UJ2, UJ3], never,
+        [VR1, VR2, VR3], [VJ1, VJ2, VJ3], never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3309,8 +3311,9 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      */
     when<TR1, TJ1 = any, TN1 = any,
         UR1 = any, UJ1 = any, UN1 = any>
-        (deferredT: TR1 | JQuery.Thenable<TR1> | JQuery.Promise<TR1, TJ1, TN1>,
-         deferredU: UR1 | JQuery.Thenable<UR1> | JQuery.Promise<UR1, UJ1, UN1>): JQuery.Promise2<TR1, TJ1, TN1, UR1, UJ1, UN1>;
+        (deferredT: JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1,
+         deferredU: JQuery.Promise<UR1, UJ1, UN1> | JQuery.Thenable<UR1> | UR1): JQuery.Promise2<TR1, TJ1, never,
+        UR1, UJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3324,11 +3327,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
         UR1 = never, UJ1 = never, UN1 = never,
         UR2 = never, UJ2 = never, UN2 = never,
         UR3 = never, UJ3 = never, UN3 = never>
-        (deferredT: JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2> |
-             JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3>,
-         deferredU: JQuery.Promise2<UR1, UJ1, UN1, UR2, UJ2, UN2> |
-             JQuery.Promise3<UR1, UJ1, UN1, UR2, UJ2, UN2, UR3, UJ3, UN3>): JQuery.Promise2<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], [TN1, TN2, TN3],
-        [UR1, UR2, UR3], [UJ1, UJ2, UJ3], [UN1, UN2, UN3]>;
+        (deferredT: JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3> |
+             JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>,
+         deferredU: JQuery.Promise3<UR1, UJ1, UN1, UR2, UJ2, UN2, UR3, UJ3, UN3> |
+             JQuery.Promise2<UR1, UJ1, UN1, UR2, UJ2, UN2>): JQuery.Promise2<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], never,
+        [UR1, UR2, UR3], [UJ1, UJ2, UJ3], never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3336,7 +3339,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1 = any, TN1 = any>(deferred: TR1 | JQuery.Thenable<TR1> | JQuery.Promise<TR1, TJ1, TN1>): JQuery.Promise<TR1, TJ1, TN1>;
+    when<TR1, TJ1 = any, TN1 = any>(deferred: JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1): JQuery.Promise<TR1, TJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3346,18 +3349,9 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      */
     when<TR1, TJ1, TN1,
         TR2, TJ2, TN2,
-        TR3, TJ3, TN3>
-        (deferredT: JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3>): JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3>;
-    /**
-     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
-     * Deferred objects that represent asynchronous events.
-     *
-     * @see {@link https://api.jquery.com/jQuery.when/}
-     * @since 1.5
-     */
-    when<TR1, TJ1, TN1,
-        TR2, TJ2, TN2>
-        (deferredT: JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>): JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>;
+        TR3 = never, TJ3 = never, TN3 = never>
+        (deferredT: JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3> |
+            JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>): JQuery.Promise3<TR1, TJ1, never, TR2, TJ2, never, TR3, TJ3, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3366,7 +3360,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1 = never, TJ1 = never, TN1 = never>(...deferreds: Array<TR1 | JQuery.Thenable<TR1>>): JQuery.Promise<TR1, TJ1, TN1>;
+    when<TR1 = never, TJ1 = never, TN1 = never>(...deferreds: Array<TR1 | JQuery.Thenable<TR1>>): JQuery.Promise<TR1, TJ1, never>;
 }
 
 declare namespace JQuery {
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 8a6710a2fd..609f65c6f1 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4449,27 +4449,51 @@ function JQueryStatic() {
                 const w = $.when(t, u, v);
 
                 w.then((a, b, c) => {
-                    // $ExpectType [string, SuccessTextStatus, jqXHR<string>]
-                    a;
-                    // $ExpectType [number, SuccessTextStatus, jqXHR<number>]
-                    b;
-                    // $ExpectType [boolean, SuccessTextStatus, jqXHR<boolean>]
-                    c;
+                    // $ExpectType string
+                    a[0];
+                    // $ExpectType SuccessTextStatus
+                    a[1];
+                    // $ExpectType jqXHR<string>
+                    a[2];
+                    // $ExpectType number
+                    b[0];
+                    // $ExpectType SuccessTextStatus
+                    b[1];
+                    // $ExpectType jqXHR<number>
+                    b[2];
+                    // $ExpectType boolean
+                    c[0];
+                    // $ExpectType SuccessTextStatus
+                    c[1];
+                    // $ExpectType jqXHR<boolean>
+                    c[2];
                 });
                 w.catch((a, b, c) => {
-                    // $ExpectType [jqXHR<string>, ErrorTextStatus, string]
-                    a;
-                    // $ExpectType [jqXHR<number>, ErrorTextStatus, string]
-                    b;
-                    // $ExpectType [jqXHR<boolean>, ErrorTextStatus, string]
-                    c;
+                    // $ExpectType jqXHR<string>
+                    a[0];
+                    // $ExpectType ErrorTextStatus
+                    a[1];
+                    // $ExpectType string
+                    a[2];
+                    // $ExpectType jqXHR<number>
+                    b[0];
+                    // $ExpectType ErrorTextStatus
+                    b[1];
+                    // $ExpectType string
+                    b[2];
+                    // $ExpectType jqXHR<boolean>
+                    c[0];
+                    // $ExpectType ErrorTextStatus
+                    c[1];
+                    // $ExpectType string
+                    c[2];
                 });
                 w.then(null, null, (a, b, c) => {
-                    // $ExpectType [never, never, never]
+                    // $ExpectType never
                     a;
-                    // $ExpectType [never, never, never]
+                    // $ExpectType never
                     b;
-                    // $ExpectType [never, never, never]
+                    // $ExpectType never
                     c;
                 });
             }
@@ -4479,21 +4503,37 @@ function JQueryStatic() {
                 const w = $.when(t, u);
 
                 w.then((a, b) => {
-                    // $ExpectType [string, SuccessTextStatus, jqXHR<string>]
-                    a;
-                    // $ExpectType [number, SuccessTextStatus, jqXHR<number>]
-                    b;
+                    // $ExpectType string
+                    a[0];
+                    // $ExpectType SuccessTextStatus
+                    a[1];
+                    // $ExpectType jqXHR<string>
+                    a[2];
+                    // $ExpectType number
+                    b[0];
+                    // $ExpectType SuccessTextStatus
+                    b[1];
+                    // $ExpectType jqXHR<number>
+                    b[2];
                 });
                 w.catch((a, b) => {
-                    // $ExpectType [jqXHR<string>, ErrorTextStatus, string]
-                    a;
-                    // $ExpectType [jqXHR<number>, ErrorTextStatus, string]
-                    b;
+                    // $ExpectType jqXHR<string>
+                    a[0];
+                    // $ExpectType ErrorTextStatus
+                    a[1];
+                    // $ExpectType string
+                    a[2];
+                    // $ExpectType jqXHR<number>
+                    b[0];
+                    // $ExpectType ErrorTextStatus
+                    b[1];
+                    // $ExpectType string
+                    b[2];
                 });
                 w.then(null, null, (a, b) => {
-                    // $ExpectType [never, never, never]
+                    // $ExpectType never
                     a;
-                    // $ExpectType [never, never, never]
+                    // $ExpectType never
                     b;
                 });
             }
@@ -4539,27 +4579,39 @@ function JQueryStatic() {
                 const w = $.when(t, u, v);
 
                 w.then((a, b, c) => {
-                    // $ExpectType [string, boolean, never]
-                    a;
-                    // $ExpectType [string, boolean, never]
-                    b;
-                    // $ExpectType [string, boolean, never]
-                    c;
+                    // $ExpectType string
+                    a[0];
+                    // $ExpectType boolean
+                    a[1];
+                    // $ExpectType string
+                    b[0];
+                    // $ExpectType boolean
+                    b[1];
+                    // $ExpectType string
+                    c[0];
+                    // $ExpectType boolean
+                    c[1];
                 });
                 w.catch((a, b, c) => {
-                    // $ExpectType [Error, any, never]
-                    a;
-                    // $ExpectType [Error, any, never]
-                    b;
-                    // $ExpectType [Error, any, never]
-                    c;
+                    // $ExpectType Error
+                    a[0];
+                    // $ExpectType any
+                    a[1];
+                    // $ExpectType Error
+                    b[0];
+                    // $ExpectType any
+                    b[1];
+                    // $ExpectType Error
+                    c[0];
+                    // $ExpectType any
+                    c[1];
                 });
                 w.then(null, null, (a, b, c) => {
-                    // $ExpectType [number, any, never]
+                    // $ExpectType never
                     a;
-                    // $ExpectType [number, any, never]
+                    // $ExpectType never
                     b;
-                    // $ExpectType [number, any, never]
+                    // $ExpectType never
                     c;
                 });
             }
@@ -4569,21 +4621,29 @@ function JQueryStatic() {
                 const w = $.when(t, u);
 
                 w.then((a, b) => {
-                    // $ExpectType [string, boolean, never]
-                    a;
-                    // $ExpectType [string, boolean, never]
-                    b;
+                    // $ExpectType string
+                    a[0];
+                    // $ExpectType boolean
+                    a[1];
+                    // $ExpectType string
+                    b[0];
+                    // $ExpectType boolean
+                    b[1];
                 });
                 w.catch((a, b) => {
-                    // $ExpectType [Error, any, never]
-                    a;
-                    // $ExpectType [Error, any, never]
-                    b;
+                    // $ExpectType Error
+                    a[0];
+                    // $ExpectType any
+                    a[1];
+                    // $ExpectType Error
+                    b[0];
+                    // $ExpectType any
+                    b[1];
                 });
                 w.then(null, null, (a, b) => {
-                    // $ExpectType [number, any, never]
+                    // $ExpectType never
                     a;
-                    // $ExpectType [number, any, never]
+                    // $ExpectType never
                     b;
                 });
             }
@@ -4605,9 +4665,9 @@ function JQueryStatic() {
                     b;
                 });
                 w.then(null, null, (a, b) => {
-                    // $ExpectType number
+                    // $ExpectType never
                     a;
-                    // $ExpectType any
+                    // $ExpectType never
                     b;
                 });
             }
@@ -4620,14 +4680,12 @@ function JQueryStatic() {
                 // $ExpectType string
                 value;
             });
-
             w.catch(reason => {
                 // $ExpectType Error
                 reason;
             });
-
             w.then(null, null, value => {
-                // $ExpectType number
+                // $ExpectType never
                 value;
             });
         }
@@ -4676,11 +4734,7 @@ function JQueryStatic() {
             }
 
             $.when().then(() => {
-                const f = first();
-                // $ExpectType Promise<string, any, any>
-                f;
-
-                return f;
+                return first();
             }).then((value) => {
                 // $ExpectType string
                 value;
@@ -4699,12 +4753,18 @@ function JQueryStatic() {
                     const task2 = this.runTask2();
                     const task3 = this.runTask3();
 
-                    // $ExpectType Promise<One, any, any>
-                    task1;
-                    // $ExpectType Promise<Two, any, any>
-                    task2;
-                    // $ExpectType Promise<Three, any, any>
-                    task3;
+                    task1.then(value => {
+                        // $ExpectType One
+                        value;
+                    });
+                    task2.then(value => {
+                        // $ExpectType Two
+                        value;
+                    });
+                    task3.then(value => {
+                        // $ExpectType Three
+                        value;
+                    });
 
                     $.when(task1, task2, task3)
                         .done((r1, r2, r3) => {

From 5b5774fe893f48b487a96a53cc9350d3898c0c2f Mon Sep 17 00:00:00 2001
From: Koloto <alkoloto@hotmail.com>
Date: Mon, 26 Jun 2017 16:53:31 +0300
Subject: [PATCH 046/287] [selectize] Extended plugins option, added options
 and items API properties

---
 types/selectize/index.d.ts         | 21 ++++++++++++++---
 types/selectize/selectize-tests.ts | 38 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/types/selectize/index.d.ts b/types/selectize/index.d.ts
index a9b7d77e7e..6c4649e0b5 100644
--- a/types/selectize/index.d.ts
+++ b/types/selectize/index.d.ts
@@ -149,11 +149,11 @@ declare namespace Selectize {
         selectOnTab?: boolean;
 
         /**
-         * An array of plugins to use
+         * Plugins to use
          *
          * Default: null
          */
-        plugins?: string[];
+        plugins?: string[] | IPluginOption[] | { [name: string]: any };
 
         // Data / Searching
         // ------------------------------------------------------------------------------------------------------------
@@ -369,6 +369,15 @@ declare namespace Selectize {
 
     // see https://github.com/brianreavis/selectize.js/blob/master/docs/api.md
     interface IApi<T, U> {
+        /**
+         * An array of selected values.
+         */
+        items: T[];
+
+        /**
+         * An object containing the entire pool of options. The object is keyed by each object's value.
+         */
+        options: { [value: string]: U };
 
         // Dropdown Options
         // ------------------------------------------------------------------------------------------------------------
@@ -398,7 +407,7 @@ declare namespace Selectize {
         /**
          * Retrieves the jQuery element for the option identified by the given value.
          */
-        getOption(value: T): any;
+        getOption(value: T): JQuery;
 
         /**
          * Retrieves the jQuery element for the previous or next option, relative to the currently highlighted option.
@@ -603,6 +612,12 @@ declare namespace Selectize {
          */
         items: ISearchResult[];
     }
+
+    // see https://github.com/selectize/selectize.js/blob/master/docs/plugins.md
+    interface IPluginOption {
+        name: string;
+        options: any;
+    }
 }
 
 interface JQuery {
diff --git a/types/selectize/selectize-tests.ts b/types/selectize/selectize-tests.ts
index 6e66ba0992..a51b121d89 100644
--- a/types/selectize/selectize-tests.ts
+++ b/types/selectize/selectize-tests.ts
@@ -417,3 +417,41 @@ $("#select-car").selectize({
     plugins: ['optgroup_columns'],
     openOnFocus: false
 });
+
+// Plugins example
+// --------------------------------------------------------------------------------------------------------------------
+$('.input-tags').selectize({
+    plugins: ['remove_button'],
+    persist: false,
+    create: true,
+    render: {
+        item: function(data, escape) {
+            return '<div>"' + escape(data.text) + '"</div>';
+        }
+    },
+    onDelete: function(values) {
+        return confirm(values.length > 1 ? 'Are you sure you want to remove these ' + values.length + ' items?' : 'Are you sure you want to remove "' + values[0] + '"?');
+    }
+});
+
+$('#input-tags6').selectize({
+    plugins: ['restore_on_backspace'],
+    persist: false,
+    create: true
+});
+
+$('.input-sortable').selectize({
+    plugins: ['drag_drop'],
+    persist: false,
+    create: true
+});
+
+$('.demo-code-language').selectize({
+    sortField: 'text',
+    hideSelected: false,
+    plugins: {
+        'dropdown_header': {
+            title: 'Language'
+        }
+    }
+});

From b4464ff4b4c7c6ef5fdea588ed700a485355bdbf Mon Sep 17 00:00:00 2001
From: Koloto <alkoloto@hotmail.com>
Date: Mon, 26 Jun 2017 17:02:18 +0300
Subject: [PATCH 047/287] [selectize] Extended plugins option, added options
 and items API properties: updated version

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

diff --git a/types/selectize/index.d.ts b/types/selectize/index.d.ts
index 6c4649e0b5..884837f223 100644
--- a/types/selectize/index.d.ts
+++ b/types/selectize/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Selectize 0.12.13
+// Type definitions for Selectize 0.12.14
 // Project: https://github.com/brianreavis/selectize.js
 // Definitions by: Adi Dahiya <https://github.com/adidahiya>, Natalie Bausch <https://github.com/naBausch>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From f3bcbe6132ecc5042804db7ccfa8911f7e5cef0e Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 10:39:41 -0400
Subject: [PATCH 048/287] [jquery] Document 3.2 deprecations.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index bae24d9780..d13ed8af42 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -2906,6 +2906,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param hold Indicates whether the ready hold is being requested or released
      * @see {@link https://api.jquery.com/jQuery.holdReady/}
      * @since 1.6
+     * @deprecated 3.2
      */
     holdReady(hold: boolean): void;
     /**
@@ -2932,6 +2933,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param obj Object to test whether or not it is an array.
      * @see {@link https://api.jquery.com/jQuery.isArray/}
      * @since 1.3
+     * @deprecated 3.2
      */
     isArray(obj: any): obj is any[];
     /**

From 8000e19efad0793b1e887b67dfa1534972935405 Mon Sep 17 00:00:00 2001
From: Luka Zakrajsek <luka@bancek.net>
Date: Mon, 26 Jun 2017 17:00:23 +0200
Subject: [PATCH 049/287] Add actionTypes

---
 types/redux-form/index.d.ts           |  1 +
 types/redux-form/lib/actionTypes.d.ts | 37 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 types/redux-form/lib/actionTypes.d.ts

diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 22b23ee23f..84bf7fbd8d 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -41,5 +41,6 @@ export * from "./lib/FieldArray";
 export * from "./lib/Form";
 export * from "./lib/FormSection";
 export * from "./lib/actions";
+export * from "./lib/actionTypes";
 export * from "./lib/reducer";
 export * from "./lib/selectors";
diff --git a/types/redux-form/lib/actionTypes.d.ts b/types/redux-form/lib/actionTypes.d.ts
new file mode 100644
index 0000000000..ce1ba5d208
--- /dev/null
+++ b/types/redux-form/lib/actionTypes.d.ts
@@ -0,0 +1,37 @@
+export interface ActionTypes {
+    ARRAY_INSERT: string;
+    ARRAY_MOVE: string;
+    ARRAY_POP: string;
+    ARRAY_PUSH: string;
+    ARRAY_REMOVE: string;
+    ARRAY_REMOVE_ALL: string;
+    ARRAY_SHIFT: string;
+    ARRAY_SPLICE: string;
+    ARRAY_UNSHIFT: string;
+    ARRAY_SWAP: string;
+    AUTOFILL: string;
+    BLUR: string;
+    CHANGE: string;
+    CLEAR_SUBMIT: string;
+    CLEAR_SUBMIT_ERRORS: string;
+    CLEAR_ASYNC_ERROR: string;
+    DESTROY: string;
+    FOCUS: string;
+    INITIALIZE: string;
+    REGISTER_FIELD: string;
+    RESET: string;
+    SET_SUBMIT_FAILED: string;
+    SET_SUBMIT_SUCCEEDED: string;
+    START_ASYNC_VALIDATION: string;
+    START_SUBMIT: string;
+    STOP_ASYNC_VALIDATION: string;
+    STOP_SUBMIT: string;
+    SUBMIT: string;
+    TOUCH: string;
+    UNREGISTER_FIELD: string;
+    UNTOUCH: string;
+    UPDATE_SYNC_ERRORS: string;
+    UPDATE_SYNC_WARNINGS: string;
+}
+
+export const actionTypes: ActionTypes;

From 0cdf591f07e88f91e7ae6ec0d35e4e70110e6d8b Mon Sep 17 00:00:00 2001
From: Luka Zakrajsek <luka@bancek.net>
Date: Mon, 26 Jun 2017 17:01:08 +0200
Subject: [PATCH 050/287] Fix reducer plugin

---
 types/redux-form/lib/reducer.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/redux-form/lib/reducer.d.ts b/types/redux-form/lib/reducer.d.ts
index 9b7f3ed520..f1dc6315bf 100644
--- a/types/redux-form/lib/reducer.d.ts
+++ b/types/redux-form/lib/reducer.d.ts
@@ -1,9 +1,7 @@
 import { Action, Reducer } from "redux";
 import { FieldType } from "../index";
 
-export function reducer(state: FormStateMap, action: Action): FormStateMap & FormReducer;
-
-export interface FormReducer {
+export interface FormReducer extends Reducer<FormStateMap> {
     /**
      * Returns a form reducer that will also pass each action through
      * additional reducers specified. The parameter should be an object mapping
@@ -11,9 +9,11 @@ export interface FormReducer {
      * passed to each reducer will only be the slice that pertains to that
      * form.
      */
-    plugin(reducers: FormReducerMapObject): Reducer<any>;
+    plugin(reducers: FormReducerMapObject): Reducer<FormStateMap>;
 }
 
+export const reducer: FormReducer;
+
 export interface FormReducerMapObject {
     [formName: string]: Reducer<any>;
 }

From beaa0068a7e9856acac74bda9c8aabcdd48dcef4 Mon Sep 17 00:00:00 2001
From: Luka Zakrajsek <luka@bancek.net>
Date: Mon, 26 Jun 2017 17:01:24 +0200
Subject: [PATCH 051/287] Add FormAction

---
 types/redux-form/lib/actions.d.ts | 68 +++++++++++++++++--------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/types/redux-form/lib/actions.d.ts b/types/redux-form/lib/actions.d.ts
index c96d5ffbb7..b126549f68 100644
--- a/types/redux-form/lib/actions.d.ts
+++ b/types/redux-form/lib/actions.d.ts
@@ -1,81 +1,87 @@
 import { Action } from "redux";
 import { FormErrors, FormWarnings, FieldType } from "../index";
 
+export interface FormAction extends Action {
+    meta: {
+        form: string;
+    };
+}
+
 /**
  * Inserts an item into a field array at the specified index
  */
-export function arrayInsert(form: string, field: string, index: number, value: any): Action;
+export function arrayInsert(form: string, field: string, index: number, value: any): FormAction;
 
 /**
  * Moves an item from one index in the array to another. In effect, it performs a remove and an
  * insert, so the item already at the `to` position will be bumped to a higher index, not overwritten.
  */
-export function arrayMove(form: string, field: string, from: number, to: number): Action;
+export function arrayMove(form: string, field: string, from: number, to: number): FormAction;
 
 /**
  * Removes an item from the end of a field array
  */
-export function arrayPop(form: string, field: string): Action;
+export function arrayPop(form: string, field: string): FormAction;
 
 /**
  * Appends an item to the end of a field array
  */
-export function arrayPush(form: string, field: string, value: any): Action;
+export function arrayPush(form: string, field: string, value: any): FormAction;
 
 /**
  * Removes an item at the specified index from a field array
  */
-export function arrayRemove(form: string, field: string, index: number): Action;
+export function arrayRemove(form: string, field: string, index: number): FormAction;
 
 /**
  * Removes all items from a field array
  */
-export function arrayRemoveAll(form: string, field: string): Action;
+export function arrayRemoveAll(form: string, field: string): FormAction;
 
 /**
  * Removes an item from the beginning of a field array
  */
-export function arrayShift(form: string, field: string): Action;
+export function arrayShift(form: string, field: string): FormAction;
 
 /**
  * ADVANCED USAGE - Inserts and/or removes items from a field array. Works similarly to Array.splice.
  */
-export function arraySplice(form: string, field: string, index: number, removeNum: number, value: any): Action;
+export function arraySplice(form: string, field: string, index: number, removeNum: number, value: any): FormAction;
 
 /**
  * Swaps two items at the specified indexes in a field array
  */
-export function arraySwap(form: string, field: string, indexA: number, indexB: number): Action;
+export function arraySwap(form: string, field: string, indexA: number, indexB: number): FormAction;
 
 /**
  * Inserts an item at the beginning of a field array
  */
-export function arrayUnshift(form: string, field: string, value: any): Action;
+export function arrayUnshift(form: string, field: string, value: any): FormAction;
 
 /**
  * Saves the value to the field and sets its `autofilled` property to `true`.
  */
-export function autofill(form: string, field: string, value: any): Action;
+export function autofill(form: string, field: string, value: any): FormAction;
 
 /**
  * Saves the value to the field
  */
-export function blur(form: string, field: string, value: any): Action;
+export function blur(form: string, field: string, value: any): FormAction;
 
 /**
  * Saves the value to the field
  */
-export function change(form: string, field: string, value: any): Action;
+export function change(form: string, field: string, value: any): FormAction;
 
 /**
  * Destroys the form, removing all it's state
  */
-export function destroy(...form: string[]): Action;
+export function destroy(...form: string[]): FormAction;
 
 /**
  * Marks the given field as active and visited
  */
-export function focus(form: string, field: string): Action;
+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.
@@ -88,67 +94,67 @@ interface InitializeOptions {
     keepSubmitSucceeded: boolean;
 }
 
-export function initialize(form: string, data: any, keepDirty?: boolean | InitializeOptions, options?: InitializeOptions): Action;
+export function initialize(form: string, data: any, keepDirty?: boolean | InitializeOptions, options?: InitializeOptions): FormAction;
 
 /**
  * Registers a field with the form.
  */
-export function registerField(form: string, name: string, type: FieldType): Action;
+export function registerField(form: string, name: string, type: FieldType): FormAction;
 
 /**
  * Resets the values in the form back to the values past in with the most recent initialize action.
  */
-export function reset(form: string): Action;
+export function reset(form: string): FormAction;
 
 /**
  * Flips the asyncValidating flag true
  */
-export function startAsyncValidation(form: string): Action;
+export function startAsyncValidation(form: string): FormAction;
 
 /**
  * Flips the asyncValidating flag false and populates asyncError for each field.
  */
-export function stopAsyncValidation(form: string, errors?: any): Action;
+export function stopAsyncValidation(form: string, errors?: any): FormAction;
 
-export function setSubmitFailed(form: string, ...fields: string[]): Action;
+export function setSubmitFailed(form: string, ...fields: string[]): FormAction;
 
-export function setSubmitSucceeded(form: string, ...fields: string[]): Action;
+export function setSubmitSucceeded(form: string, ...fields: string[]): FormAction;
 
 /**
  * Flips the submitting flag true.
  */
-export function startSubmit(form: string): Action;
+export function startSubmit(form: string): FormAction;
 
 /**
  * Flips the submitting flag false and populates submitError for each field.
  */
-export function stopSubmit(form: string, errors?: any): Action;
+export function stopSubmit(form: string, errors?: any): FormAction;
 
 /**
  * Flips the asyncValidating flag false and populates asyncError for each field.
  */
-export function stopAsyncValidation(form: string, errors?: any): Action;
+export function stopAsyncValidation(form: string, errors?: any): FormAction;
 
 /**
  * Triggers a submission of the specified form.
  */
-export function submit(form: string): Action;
+export function submit(form: string): FormAction;
 
 /**
  * Marks all the fields passed in as touched.
  */
-export function touch(form: string, ...fields: string[]): Action;
+export function touch(form: string, ...fields: string[]): FormAction;
 
 /**
  * Unregisters a field with the form.
  */
-export function unregisterField(form: string, name: string): Action;
+export function unregisterField(form: string, name: string): FormAction;
 
 /**
  * Resets the 'touched' flag for all the fields passed in.
  */
-export function untouch(form: string, ...fields: string[]): Action;
+export function untouch(form: string, ...fields: string[]): FormAction;
 
-export function updateSyncErrors(from: string, syncErrors: FormErrors<FormData>, error: any): Action;
+export function updateSyncErrors(from: string, syncErrors: FormErrors<FormData>, error: any): FormAction;
 
-export function updateSyncWarnings(form: string, syncWarnings: FormWarnings<FormData>, warning: any): Action;
+export function updateSyncWarnings(form: string, syncWarnings: FormWarnings<FormData>, warning: any): FormAction;

From 561e9978131dc3b22954a2cc4e7792a5c1f04237 Mon Sep 17 00:00:00 2001
From: Luka Zakrajsek <luka@bancek.net>
Date: Mon, 26 Jun 2017 17:02:36 +0200
Subject: [PATCH 052/287] Add StrictFormProps

---
 types/redux-form/lib/reduxForm.d.ts | 66 +++++++++++++++--------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/types/redux-form/lib/reduxForm.d.ts b/types/redux-form/lib/reduxForm.d.ts
index 61fb88ac23..c961668cd2 100644
--- a/types/redux-form/lib/reduxForm.d.ts
+++ b/types/redux-form/lib/reduxForm.d.ts
@@ -337,20 +337,16 @@ export interface FormComponent<FormData extends DataShape, P, S> extends Compone
     wrappedInstance: ReactElement<P & FormProps<FormData, P, S>>
 }
 
-/**
- * These are the props that will be passed to your form component.
- * Your form component's props can extend this interface.
- */
-export interface FormProps<FormData extends DataShape, P, S> {
+export interface StrictFormProps<FormData extends DataShape, P, S> {
     /**
      * true if any of the fields have been marked as touched, false otherwise.
      */
-    anyTouched?: boolean;
+    anyTouched: boolean;
 
     /**
      * A set of pre-bound action creators for you to operate on array fields in your form.
      */
-    array?: {
+    array: {
         /**
          * Inserts a value into the given array field in your form.
          */
@@ -407,7 +403,7 @@ export interface FormProps<FormData extends DataShape, P, S> {
      * A function that may be called to initiate asynchronous validation if
      * asynchronous validation is enabled.
      */
-    asyncValidate?: () => void;
+    asyncValidate: () => void;
 
     /**
      * This value will be either:
@@ -415,54 +411,54 @@ export interface FormProps<FormData extends DataShape, P, S> {
      * - true - Asynchronous validation is currently running in preparation to submit a form
      * - a string - The name of the field that just blurred to trigger asynchronous validation
      */
-    asyncValidating?: string | boolean;
+    asyncValidating: string | boolean;
 
     /**
      * Sets the value and marks the field as autofilled in the Redux Store. This is useful when a field
      * needs to be set programmatically, but in a way that lets the user know (via a styling change using
      * the autofilled prop in Field) that it has been autofilled for them programmatically.
      */
-    autofill?(field: string, value: FieldValue): void;
+    autofill(field: string, value: FieldValue): void;
 
     /**
      * Marks a field as blurred in the Redux store.
      */
-    blur?(field: string, value: FieldValue): void;
+    blur(field: string, value: FieldValue): void;
 
     /**
      * Changes the value of a field in the Redux store.
      */
-    change?(field: string, value: FieldValue): void;
+    change(field: string, value: FieldValue): void;
 
     /**
      * Clear async error of a field in the Redux store.
      */
-    clearAsyncError?(field: string): void;
+    clearAsyncError(field: string): void;
 
     /**
      * Destroys the form state in the Redux store. By default, this will be
      * called for you in componentWillUnmount().
      */
-    destroy?(): void;
+    destroy(): void;
 
     /**
      * true if the form data has changed from its initialized values. Opposite
      * of pristine.
      */
-    dirty?: boolean;
+    dirty: boolean;
 
     /**
      * A generic error for the entire form given by the _error key in the
      * result from the synchronous validation function, the asynchronous
      * validation, or the rejected promise from onSubmit.
      */
-    error?: string;
+    error: string;
 
     /**
      * The form name that you gave to the reduxForm() decorator or the prop you
      * passed in to your decorated form component.
      */
-    form?: string;
+    form: string;
 
     /**
      * A function meant to be passed to <form onSubmit={handleSubmit}> or to
@@ -484,79 +480,87 @@ export interface FormProps<FormData extends DataShape, P, S> {
      * may pass that as if it were the error for a field called _error, and
      * it will be given as the error prop.
      */
-    handleSubmit?(event: SyntheticEvent<any>): void; // same as ReactEventHandler
+    handleSubmit(event: SyntheticEvent<any>): void; // same as ReactEventHandler
 
-    handleSubmit?(submit: SubmitHandler<FormData, P, S>): ReactEventHandler<any>;
+    handleSubmit(submit: SubmitHandler<FormData, P, S>): ReactEventHandler<any>;
 
     /**
      * Initializes the form data to the given values. All dirty and pristine
      * state will be determined by comparing the current data with these
      * initialized values.
      */
-    initialize?(data: FormData): void;
+    initialize(data: FormData): void;
 
     /**
      * The same initialValues object passed to reduxForm to initialize the form data.
      */
-    initialValues?: Partial<FormData>;
+    initialValues: Partial<FormData>;
 
     /**
      * true if the form has validation errors. Opposite of valid.
      */
-    invalid?: boolean;
+    invalid: boolean;
 
     /**
      * true if the form data is the same as its initialized values. Opposite
      * of dirty.
      */
-    pristine?: boolean;
+    pristine: boolean;
 
     /**
      * Resets all the values in the form to the initialized state, making it
      * pristine again.
      */
-    reset?(): void;
+    reset(): 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
      * will be true until the promise is resolved or rejected.
      */
-    submitting?: boolean;
+    submitting: boolean;
 
     /**
      * Starts as false. If onSubmit is called, and fails to submit for any
      * reason, submitFailed will be set to true. A subsequent successful
      * submit will set it back to false.
      */
-    submitFailed?: boolean;
+    submitFailed: boolean;
 
     /**
      * Starts as false. If onSubmit is called, and succeed to submit,
      * submitSucceeded will be set to true. A subsequent unsuccessful
      * submit will set it back to false.
      */
-    submitSucceeded?: boolean;
+    submitSucceeded: boolean;
 
     /**
      * Marks the given fields as "touched" to show errors.
      */
-    touch?(...field: string[]): void;
+    touch(...field: string[]): void;
 
     /**
      * Clears the "touched" flag for the given fields
      */
-    untouch?(...field: string[]): void;
+    untouch(...field: string[]): void;
 
     /**
      * true if the form passes validation (has no validation errors). Opposite
      * of invalid.
      */
-    valid?: boolean;
+    valid: boolean;
 
     /**
      * A generic warning for the entire form given by the `_warning` key in the result from the
      * synchronous warning function.
      */
-    warning?: string;
+    warning: string;
+}
+
+/**
+ * These are the props that will be passed to your form component.
+ * Your form component's props can extend this interface.
+ */
+export interface FormProps<FormData extends DataShape, P, S> extends Partial<StrictFormProps<FormData, P, S>> {
+
 }

From c5c27159d32537335bfb4c444c7145faddb47082 Mon Sep 17 00:00:00 2001
From: Luka Zakrajsek <luka@bancek.net>
Date: Mon, 26 Jun 2017 17:03:11 +0200
Subject: [PATCH 053/287] Add tests for reducer plugin and action types

---
 types/redux-form/redux-form-tests.tsx | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 7d3dbdd483..086e03f319 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { Component } from 'react';
-import { Field, GenericField, reduxForm, WrappedFieldProps, BaseFieldProps, FormProps } from "redux-form";
+import { Action } from 'redux';
+import { Field, GenericField, reduxForm, WrappedFieldProps, BaseFieldProps, FormProps, FormAction, actionTypes, reducer } from "redux-form";
 
 interface CustomComponentProps {
     customProp: string;
@@ -141,3 +142,23 @@ const mapStateToProps = (state: any) => ({
     initialValues: { firstName: state.account.data.firstName }  // pull initial values from account reducer
 } as {initialValues?: Partial<DataShape>});
 const ConnectedDecoratedInitializeFromStateFormClass = connect(mapStateToProps)(DecoratedInitializeFromStateFormClass);
+
+reducer({}, {
+    type: 'ACTION'
+});
+
+reducer.plugin({
+    myform: (state: any, action: FormAction) => {
+        if (action.type === actionTypes.CHANGE && action.meta.form === 'securitySettings') {
+            return {
+                ...state,
+                values: {
+                    ...state.values,
+                    downloadLinkAutoPassword: true,
+                },
+            };
+        } else {
+            return state;
+        }
+    }
+});

From c2cd577e36c67913d8dec1774962b16c476c9ad1 Mon Sep 17 00:00:00 2001
From: Luka Zakrajsek <luka@bancek.net>
Date: Mon, 26 Jun 2017 17:03:40 +0200
Subject: [PATCH 054/287] Add StrictFormProps comment

---
 types/redux-form/lib/reduxForm.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/redux-form/lib/reduxForm.d.ts b/types/redux-form/lib/reduxForm.d.ts
index c961668cd2..f1eac8d928 100644
--- a/types/redux-form/lib/reduxForm.d.ts
+++ b/types/redux-form/lib/reduxForm.d.ts
@@ -337,6 +337,11 @@ export interface FormComponent<FormData extends DataShape, P, S> extends Compone
     wrappedInstance: ReactElement<P & FormProps<FormData, P, S>>
 }
 
+/**
+ * These are the props that will be passed to your form component.
+ * Your form component's props can extend this interface if you want
+ * to use strict checks.
+ */
 export interface StrictFormProps<FormData extends DataShape, P, S> {
     /**
      * true if any of the fields have been marked as touched, false otherwise.

From c6ba2a627643107bb092c96eb44f71048eeb1cec Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 11:42:19 -0400
Subject: [PATCH 055/287] [jquery] Allow writing through index signature on
 JQuery.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index d13ed8af42..8d688d1b20 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -2390,9 +2390,11 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @since 1.4
      */
     wrapInner(wrappingElement: JQuery.Selector | JQuery.htmlString | Element | JQuery | ((this: TElement, index: number) => string | JQuery | Element)): this;
+
+    [n: number]: TElement;
 }
 
-interface JQuery<TElement extends Node = HTMLElement> extends ArrayLike<TElement>, Iterable<TElement> { }
+interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> { }
 
 interface JQueryStatic<TElement extends Node = HTMLElement> {
     /**
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 609f65c6f1..cacd81bcff 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -11,7 +11,10 @@ function JQuery() {
     }
 
     function arrayLike() {
-        $('div')[0] === new HTMLElement();
+        // $ExpectType HTMLElement
+        $('div')[0];
+
+        $('div')[0] = new HTMLElement();
     }
 
     function ajax() {

From db67ce96bf7a591ff3b4a67aec3958cbefbd9483 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 12:38:05 -0400
Subject: [PATCH 056/287] [jquery] Promises cleanup.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 8d688d1b20..22c8ccc40e 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3364,7 +3364,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1 = never, TJ1 = never, TN1 = never>(...deferreds: Array<TR1 | JQuery.Thenable<TR1>>): JQuery.Promise<TR1, TJ1, never>;
+    when<TR1 = never, TJ1 = never, TN1 = never>(...deferreds: Array<JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1>): JQuery.Promise<TR1, TJ1, never>;
 }
 
 declare namespace JQuery {
@@ -4318,14 +4318,14 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.promise/}
          * @since 1.5
          */
-        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TR> & TTarget;
+        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TR, TJ, TN> & TTarget;
         /**
          * Return a Deferred's Promise object.
          *
          * @see {@link https://api.jquery.com/deferred.promise/}
          * @since 1.5
          */
-        promise(): JQuery.Promise<TR>;
+        promise(): JQuery.Promise<TR, TJ, TN>;
         /**
          * Determine the current state of a Deferred object.
          *
@@ -4341,7 +4341,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.catch/}
          * @since 3.0
          */
-        catch<AR, AJ = never, AN = TN>(failFilter: (...reasons: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        catch<AR, AJ = never, AN = TN>(failFilter: (...reasons: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
 
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -4355,9 +4355,9 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>,
-             progressFilter: (...t: TN[]) => AN3 | Thenable<AN3> | JQuery.Promise<AR3, AJ3, AN3>): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR3, AJ3, AN3> | Thenable<AN3> | AN3): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4371,8 +4371,8 @@ declare namespace JQuery {
          */
         pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4385,9 +4385,9 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
              failFilter: null,
-             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4402,7 +4402,7 @@ declare namespace JQuery {
         pipe<AR = TJ, AJ = TJ, AN = TN>
             (doneFilter: null,
              failFilter: null,
-             progressFilter: (...t: TN[]) => AN | Thenable<AN> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AN> | AN): JQuery.Promise<AR, AJ, AN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4414,8 +4414,8 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4428,7 +4428,7 @@ declare namespace JQuery {
          */
         pipe<AR, AJ = never, AN = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4439,7 +4439,7 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR, AJ = TJ, AN = TN>
-            (doneFilter: (...t: TR[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
 
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -4451,9 +4451,9 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>,
-             progressFilter: (...t: TN[]) => AN3 | Thenable<AN3> | JQuery.Promise<AR3, AJ3, AN3>): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR3, AJ3, AN3> | Thenable<AN3> | AN3): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4465,8 +4465,8 @@ declare namespace JQuery {
          */
         then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4477,9 +4477,9 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
              failFilter: null,
-             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4492,7 +4492,7 @@ declare namespace JQuery {
         then<AR = TJ, AJ = TJ, AN = TN>
             (doneFilter: null,
              failFilter: null,
-             progressFilter: (...t: TN[]) => AN | Thenable<AN> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AN> | AN): JQuery.Promise<AR, AJ, AN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4502,8 +4502,8 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4514,7 +4514,7 @@ declare namespace JQuery {
          */
         then<AR, AJ = never, AN = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4523,7 +4523,7 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR, AJ = TJ, AN = TN>
-            (doneFilter: (...t: TR[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
 
         /**
          * Call the progressCallbacks on a Deferred object with the given args.
@@ -4695,7 +4695,7 @@ declare namespace JQuery {
         catch<AR, AJ = never, AN = TN,
             BR = never, BJ = never, BN = UN,
             CR = never, CJ = never, CN = VN>
-            (failFilter: (t: TJ, u: UJ, v: VJ) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+            (failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
 
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -4711,9 +4711,9 @@ declare namespace JQuery {
         pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
             BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never,
             CR1 = never, CR2 = never, CR3 = never, CJ1 = never, CJ2 = never, CJ3 = never, CN1 = CN3, CN2 = CN3, CN3 = never>
-            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
-             failFilter: (t: TJ, u: UJ, v: VJ) => AR2 | Thenable<AR2> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>,
-             progressFilter: (t: TN, u: UN, v: VN) => AN3 | Thenable<AN3> | Promise3<AR3, AJ3, AN3, BR3, BJ3, BN3, CR3, CJ3, CN3>): Promise3<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR3, AJ3, AN3, BR3, BJ3, BN3, CR3, CJ3, CN3> | Thenable<AN3> | AN3): Promise3<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
             BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3,
             CR1 | CR2 | CR3, CJ1 | CJ2 | CJ3, CN1 | CN2 | CN3>;
         /**
@@ -4731,8 +4731,8 @@ declare namespace JQuery {
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
             CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
-             progressFilter: (t: TN, u: UN, v: VN) => AN1 | Thenable<AN1> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AN1> | AN1): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
             CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
         /**
@@ -4749,9 +4749,9 @@ declare namespace JQuery {
         pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
             CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
              failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN) => AN1 | Thenable<AN1> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AN1> | AN1): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
             CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
         /**
@@ -4770,7 +4770,7 @@ declare namespace JQuery {
             CR = VJ, CJ = VJ, CN = never>
             (doneFilter: null,
              failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN) => AN | Thenable<AN> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AN> | AN): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4784,8 +4784,8 @@ declare namespace JQuery {
         pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN,
             CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = VN, CN2 = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
-             failFilter: (t: TJ, u: UJ, v: VJ) => AR2 | Thenable<AR2> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
             CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
         /**
@@ -4802,7 +4802,7 @@ declare namespace JQuery {
             BR = never, BJ = never, BN = UN,
             CR = never, CJ = never, CN = VN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4815,7 +4815,7 @@ declare namespace JQuery {
         pipe<AR, AJ = TJ, AN = TN,
             BR = never, BJ = UJ, BN = UN,
             CR = never, CJ = VJ, CN = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
 
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -4829,9 +4829,9 @@ declare namespace JQuery {
         then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
             BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never,
             CR1 = never, CR2 = never, CR3 = never, CJ1 = never, CJ2 = never, CJ3 = never, CN1 = CN3, CN2 = CN3, CN3 = never>
-            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
-             failFilter: (t: TJ, u: UJ, v: VJ) => AR2 | Thenable<AR2> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>,
-             progressFilter: (t: TN, u: UN, v: VN) => AN3 | Thenable<AN3> | Promise3<AR3, AJ3, AN3, BR3, BJ3, BN3, CR3, CJ3, CN3>): Promise3<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR3, AJ3, AN3, BR3, BJ3, BN3, CR3, CJ3, CN3> | Thenable<AN3> | AN3): Promise3<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
             BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3,
             CR1 | CR2 | CR3, CJ1 | CJ2 | CJ3, CN1 | CN2 | CN3>;
         /**
@@ -4847,8 +4847,8 @@ declare namespace JQuery {
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
             CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
-             progressFilter: (t: TN, u: UN, v: VN) => AN1 | Thenable<AN1> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AN1> | AN1): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
             CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
         /**
@@ -4863,9 +4863,9 @@ declare namespace JQuery {
         then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
             CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
              failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN) => AN1 | Thenable<AN1> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AN1> | AN1): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
             CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
         /**
@@ -4882,7 +4882,7 @@ declare namespace JQuery {
             CR = VJ, CJ = VJ, CN = never>
             (doneFilter: null,
              failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN) => AN | Thenable<AN> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AN> | AN): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4894,8 +4894,8 @@ declare namespace JQuery {
         then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN,
             CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = VN, CN2 = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => AR1 | Thenable<AR1> | Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1>,
-             failFilter: (t: TJ, u: UJ, v: VJ) => AR2 | Thenable<AR2> | Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2>): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
             CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
         /**
@@ -4910,7 +4910,7 @@ declare namespace JQuery {
             BR = never, BJ = never, BN = UN,
             CR = never, CJ = never, CN = VN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4921,7 +4921,7 @@ declare namespace JQuery {
         then<AR, AJ = TJ, AN = TN,
             BR = never, BJ = UJ, BN = UN,
             CR = never, CJ = VJ, CN = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => AR | Thenable<AR> | Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
     }
 
     /**
@@ -5005,7 +5005,7 @@ declare namespace JQuery {
          */
         catch<AR, AJ = never, AN = TN,
             BR = never, BJ = never, BN = UN>
-            (failFilter: (t: TJ, u: UJ) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+            (failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
 
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -5020,9 +5020,9 @@ declare namespace JQuery {
          */
         pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
             BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never>
-            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
-             failFilter: (t: TJ, u: UJ) => AR2 | Thenable<AR2> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>,
-             progressFilter: (t: TN, u: UN) => AN3 | Thenable<AN3> | Promise2<AR3, AJ3, AN3, BR3, BJ3, BN3>): Promise2<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
+            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
+             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2,
+             progressFilter: (t: TN, u: UN) => Promise2<AR3, AJ3, AN3, BR3, BJ3, BN3> | Thenable<AN3> | AN3): Promise2<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
             BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3>;
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -5038,8 +5038,8 @@ declare namespace JQuery {
         pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
-             progressFilter: (t: TN, u: UN) => AN1 | Thenable<AN1> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             failFilter: (t: TJ, u: UJ) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
+             progressFilter: (t: TN, u: UN) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AN1> | AN1): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -5054,9 +5054,9 @@ declare namespace JQuery {
          */
         pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
-            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
              failFilter: null,
-             progressFilter: (t: TN, u: UN) => AN1 | Thenable<AN1> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             progressFilter: (t: TN, u: UN) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AN1> | AN1): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -5073,7 +5073,7 @@ declare namespace JQuery {
             BR = UJ, BJ = UJ, BN = never>
             (doneFilter: null,
              failFilter: null,
-             progressFilter: (t: TN, u: UN) => AN | Thenable<AN> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+             progressFilter: (t: TN, u: UN) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AN> | AN): Promise2<AR, AJ, AN, BR, BJ, BN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5086,8 +5086,8 @@ declare namespace JQuery {
          */
         pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN>
-            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
-             failFilter: (t: TJ, u: UJ) => AR2 | Thenable<AR2> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
+             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -5102,7 +5102,7 @@ declare namespace JQuery {
         pipe<AR, AJ = never, AN = TN,
             BR = never, BJ = never, BN = UN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+             failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5114,7 +5114,7 @@ declare namespace JQuery {
          */
         pipe<AR, AJ = TJ, AN = TN,
             BR = never, BJ = UJ, BN = UN>
-            (doneFilter: (t: TR, u: UR) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+            (doneFilter: (t: TR, u: UR) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
 
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5127,9 +5127,9 @@ declare namespace JQuery {
          */
         then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
             BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never>
-            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
-             failFilter: (t: TJ, u: UJ) => AR2 | Thenable<AR2> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>,
-             progressFilter: (t: TN, u: UN) => AN3 | Thenable<AN3> | Promise2<AR3, AJ3, AN3, BR3, BJ3, BN3>): Promise2<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
+            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
+             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2,
+             progressFilter: (t: TN, u: UN) => Promise2<AR3, AJ3, AN3, BR3, BJ3, BN3> | Thenable<AN3> | AN3): Promise2<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
             BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5143,8 +5143,8 @@ declare namespace JQuery {
         then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
-             progressFilter: (t: TN, u: UN) => AN1 | Thenable<AN1> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             failFilter: (t: TJ, u: UJ) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
+             progressFilter: (t: TN, u: UN) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AN1> | AN1): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5157,9 +5157,9 @@ declare namespace JQuery {
          */
         then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
-            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
+            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
              failFilter: null,
-             progressFilter: (t: TN, u: UN) => AN1 | Thenable<AN1> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             progressFilter: (t: TN, u: UN) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AN1> | AN1): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5174,7 +5174,7 @@ declare namespace JQuery {
             BR = UJ, BJ = UJ, BN = never>
             (doneFilter: null,
              failFilter: null,
-             progressFilter: (t: TN, u: UN) => AN | Thenable<AN> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+             progressFilter: (t: TN, u: UN) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AN> | AN): Promise2<AR, AJ, AN, BR, BJ, BN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5185,8 +5185,8 @@ declare namespace JQuery {
          */
         then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN>
-            (doneFilter: (t: TR, u: UR) => AR1 | Thenable<AR1> | Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1>,
-             failFilter: (t: TJ, u: UJ) => AR2 | Thenable<AR2> | Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2>): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
+             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5199,7 +5199,7 @@ declare namespace JQuery {
         then<AR, AJ = never, AN = TN,
             BR = never, BJ = never, BN = UN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+             failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5209,7 +5209,7 @@ declare namespace JQuery {
          */
         then<AR, AJ = TJ, AN = TN,
             BR = never, BJ = UJ, BN = UN>
-            (doneFilter: (t: TR, u: UR) => AR | Thenable<AR> | Promise2<AR, AJ, AN, BR, BJ, BN>): Promise2<AR, AJ, AN, BR, BJ, BN>;
+            (doneFilter: (t: TR, u: UR) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
     }
 
     /**
@@ -5290,7 +5290,7 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.catch/}
          * @since 3.0
          */
-        catch<AR, AJ = never, AN = TN>(failFilter: (...reasons: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+        catch<AR, AJ = never, AN = TN>(failFilter: (...reasons: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
 
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -5304,9 +5304,9 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>,
-             progressFilter: (...t: TN[]) => AN3 | Thenable<AN3> | JQuery.Promise<AR3, AJ3, AN3>): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR3, AJ3, AN3> | Thenable<AN3> | AN3): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5320,8 +5320,8 @@ declare namespace JQuery {
          */
         pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5334,9 +5334,9 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
              failFilter: null,
-             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5351,7 +5351,7 @@ declare namespace JQuery {
         pipe<AR = TJ, AJ = TJ, AN = TN>
             (doneFilter: null,
              failFilter: null,
-             progressFilter: (...t: TN[]) => AN | Thenable<AN> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AN> | AN): JQuery.Promise<AR, AJ, AN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5363,8 +5363,8 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5377,7 +5377,7 @@ declare namespace JQuery {
          */
         pipe<AR, AJ = never, AN = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5388,7 +5388,7 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR, AJ = TJ, AN = TN>
-            (doneFilter: (...t: TR[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
 
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5400,9 +5400,9 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>,
-             progressFilter: (...t: TN[]) => AN3 | Thenable<AN3> | JQuery.Promise<AR3, AJ3, AN3>): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR3, AJ3, AN3> | Thenable<AN3> | AN3): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5414,8 +5414,8 @@ declare namespace JQuery {
          */
         then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5426,9 +5426,9 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
              failFilter: null,
-             progressFilter: (...t: TN[]) => AN1 | Thenable<AN1> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5441,7 +5441,7 @@ declare namespace JQuery {
         then<AR = TJ, AJ = TJ, AN = TN>
             (doneFilter: null,
              failFilter: null,
-             progressFilter: (...t: TN[]) => AN | Thenable<AN> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+             progressFilter: (...t: TN[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AN> | AN): JQuery.Promise<AR, AJ, AN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5451,8 +5451,8 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
-            (doneFilter: (...t: TR[]) => AR1 | Thenable<AR1> | JQuery.Promise<AR1, AJ1, AN1>,
-             failFilter: (...t: TJ[]) => AR2 | Thenable<AR2> | JQuery.Promise<AR2, AJ2, AN2>): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5463,7 +5463,7 @@ declare namespace JQuery {
          */
         then<AR, AJ = never, AN = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5472,7 +5472,7 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR, AJ = TJ, AN = TN>
-            (doneFilter: (...t: TR[]) => AR | Thenable<AR> | JQuery.Promise<AR, AJ, AN>): JQuery.Promise<AR, AJ, AN>;
+            (doneFilter: (...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
     }
 
     // endregion

From 6de6e46771fdaab4350aeea58270f8b5a46ec075 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 12:48:40 -0400
Subject: [PATCH 057/287] [jquery] Re-add non-generic catch-all for when().

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 22c8ccc40e..1e0b8de12c 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3365,6 +3365,15 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @since 1.5
      */
     when<TR1 = never, TJ1 = never, TN1 = never>(...deferreds: Array<JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1>): JQuery.Promise<TR1, TJ1, never>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @param deferreds Zero or more Thenable objects.
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when(...deferreds: any[]): JQuery.Promise<any, any, never>;
 }
 
 declare namespace JQuery {

From 6fa5e4bc987d947b14f26c3c7b4e631b1fe40cb1 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 12:57:00 -0400
Subject: [PATCH 058/287] [jquery] Make isEmptyObject() a user-defined type
 guard.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 1e0b8de12c..6c9f2abe7b 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -2945,7 +2945,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.isEmptyObject/}
      * @since 1.4
      */
-    isEmptyObject(obj: any): boolean;
+    isEmptyObject(obj: any): obj is {};
     /**
      * Determine if the argument passed is a JavaScript function object.
      *
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index cacd81bcff..5487fb5b38 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4099,8 +4099,12 @@ function JQueryStatic() {
     }
 
     function isEmptyObject() {
-        // $ExpectType boolean
-        $.isEmptyObject({});
+        function type_guard(obj: object) {
+            if ($.isEmptyObject(obj)) {
+                // $ExpectType {}
+                obj;
+            }
+        }
     }
 
     function isFunction() {

From 706908910c4fff48bd40d08af499319bc55e85cc Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 13:02:05 -0400
Subject: [PATCH 059/287] [jquery] Tween cannot be a class under JQuery.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 6c9f2abe7b..ebedbe2530 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -5568,10 +5568,11 @@ declare namespace JQuery {
         complete?(this: TElement): void;
     }
 
+    // This should be a class but doesn't work correctly under the JQuery namespace. Tween should be an inner class of jQuery.
     // Undocumented
     // https://github.com/jquery/api.jquery.com/issues/391
     // https://github.com/jquery/api.jquery.com/issues/61
-    class Tween<TElement> {
+    interface Tween<TElement> {
         easing: string;
         elem: TElement;
         end: number;

From ea4e0e5f582f25c3777ada7bafc2f6a01afb8450 Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <j.jimenez@tuta.io>
Date: Mon, 26 Jun 2017 20:01:46 +0200
Subject: [PATCH 060/287] upgraded to all new typings format

---
 .../electron-packager-tests.ts                | 13 ++--
 types/electron-packager/index.d.ts            | 68 ++++++++-----------
 types/electron-packager/tslint.json           |  5 ++
 3 files changed, 38 insertions(+), 48 deletions(-)
 create mode 100644 types/electron-packager/tslint.json

diff --git a/types/electron-packager/electron-packager-tests.ts b/types/electron-packager/electron-packager-tests.ts
index bf6122bb2f..ac717db944 100644
--- a/types/electron-packager/electron-packager-tests.ts
+++ b/types/electron-packager/electron-packager-tests.ts
@@ -1,11 +1,8 @@
-
-
 import * as packager from "electron-packager";
 
 function callback(err: Error, appPath: string) {
-	const
-		msg = err.message,
-		index = appPath.indexOf("test");
+	const msg = err.message;
+	const	index = appPath.indexOf("test");
 }
 
 packager({
@@ -23,9 +20,7 @@ packager({
 	all: true
 }, callback);
 
-const pkger = require("electron-packager");
-
-pkger({
+packager({
 	dir: ".",
 	name: "myapplication",
 	platform: "win32",
@@ -33,7 +28,7 @@ pkger({
 	version: "0.34.0"
 }, callback);
 
-pkger({
+packager({
 	dir: ".",
 	name: "myapplication",
 	version: "0.34.0",
diff --git a/types/electron-packager/index.d.ts b/types/electron-packager/index.d.ts
index cd4e582a09..57c85ba99f 100644
--- a/types/electron-packager/index.d.ts
+++ b/types/electron-packager/index.d.ts
@@ -1,13 +1,29 @@
-// Type definitions for electron-packager v5.1.0
-// Project: https://github.com/maxogden/electron-packager
+// Type definitions for electron-packager 5.1
+// Project: https://github.com/electron-userland/electron-packager
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
+//                 Juan Jimenez-Anca <https://github.com/cortopy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-declare namespace ElectronPackager {
+export = electronPackager;
+
+/**
+ * This will:
+ * - Find or download the correct release of Electron
+ * - Use that version of electron to create a app in <out>/<appname>-<platform>-<arch>
+ *
+ * You should be able to launch the app on the platform you built for. If not, check your settings and try again.
+ *
+ * @param opts - Options to configure packaging.
+ * @param callback - Callback which is called when packaging is done or an error occured.
+ */
+declare function electronPackager(opts: electronPackager.Options, callback: electronPackager.Callback): void;
+
+declare namespace electronPackager {
+    type ignoreFunction = (path: string) => boolean;
     /** Electron-packager Options. */
-    export interface Options {
+    interface Options {
         /** The source directory. */
         dir: string;
         /** The application name. */
@@ -53,7 +69,7 @@ declare namespace ElectronPackager {
         /** The directory of cached electron downloads. Defaults to "$HOME/.electron". */
         cache?: string;
         /** Do not copy files into App whose filenames regex .match this string. */
-        ignore?: RegExp | RegExp[] | { (path: string): boolean };
+        ignore?: RegExp | RegExp[] | ignoreFunction;
         /** Runs `npm prune --production` on the app. */
         prune?: boolean;
         /** If output directory for a platform already exists, replaces it rather than skipping it. */
@@ -67,7 +83,7 @@ declare namespace ElectronPackager {
     }
 
     /** Object hash of application metadata to embed into the executable (Windows only). */
-    export interface VersionString {
+    interface VersionString {
         CompanyName?: string;
         LegalCopyright?: string;
         FileDescription?: string;
@@ -79,37 +95,11 @@ declare namespace ElectronPackager {
     }
 
     /** Electron-packager done callback. */
-    export interface Callback {
-        /**
-         * Callback which is called when electron-packager is done.
-         *
-         * @param err - Contains errors if any.
-         * @param appPath - Path(s) to the newly created application(s).
-         */
-        (err: Error, appPath: string|string[]): void
-    }
-
-    /** Electron-packager function */
-    export interface Packager {
-        /**
-         * This will:
-         * - Find or download the correct release of Electron
-         * - Use that version of electron to create a app in <out>/<appname>-<platform>-<arch>
-         *
-         * You should be able to launch the app on the platform you built for. If not, check your settings and try again.
-         *
-         * @param opts - Options to configure packaging.
-         * @param callback - Callback which is called when packaging is done or an error occured.
-         */
-        (opts: Options, callback: Callback): void;
-    }
-}
-
-declare module "electron-packager" {
-    const packager: ElectronPackager.Packager;
-    export = packager;
-}
-
-interface NodeRequireFunction {
-    (id: "electron-packager"): ElectronPackager.Packager;
+    /**
+     * Callback which is called when electron-packager is done.
+     *
+     * @param err - Contains errors if any.
+     * @param appPath - Path(s) to the newly created application(s).
+     */
+    type Callback = (err: Error, appPath: string|string[]) => void;
 }
diff --git a/types/electron-packager/tslint.json b/types/electron-packager/tslint.json
new file mode 100644
index 0000000000..5d0b359e47
--- /dev/null
+++ b/types/electron-packager/tslint.json
@@ -0,0 +1,5 @@
+{ "extends": "dtslint/dt.json",
+  "rules": {
+    "no-conditional-assignment": false
+  }
+}

From 19e85a299da24fafe1216b2c07a4f29613c9b826 Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <j.jimenez@tuta.io>
Date: Mon, 26 Jun 2017 21:51:54 +0200
Subject: [PATCH 061/287] electron packager v8.7

---
 .../electron-packager-tests.ts                |   8 +-
 types/electron-packager/index.d.ts            | 255 ++++++++++++------
 2 files changed, 181 insertions(+), 82 deletions(-)

diff --git a/types/electron-packager/electron-packager-tests.ts b/types/electron-packager/electron-packager-tests.ts
index ac717db944..482c49bbff 100644
--- a/types/electron-packager/electron-packager-tests.ts
+++ b/types/electron-packager/electron-packager-tests.ts
@@ -10,13 +10,13 @@ packager({
 	name: "myapplication",
 	platform: "win32",
 	arch: "all",
-	version: "0.34.0"
+	electronVersion: "0.34.0"
 }, callback);
 
 packager({
 	dir: ".",
 	name: "myapplication",
-	version: "0.34.0",
+	electronVersion: "0.34.0",
 	all: true
 }, callback);
 
@@ -25,12 +25,12 @@ packager({
 	name: "myapplication",
 	platform: "win32",
 	arch: "all",
-	version: "0.34.0"
+	electronVersion: "0.34.0"
 }, callback);
 
 packager({
 	dir: ".",
 	name: "myapplication",
-	version: "0.34.0",
+	electronVersion: "0.34.0",
 	all: true
 }, callback);
diff --git a/types/electron-packager/index.d.ts b/types/electron-packager/index.d.ts
index 57c85ba99f..99b232388b 100644
--- a/types/electron-packager/index.d.ts
+++ b/types/electron-packager/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for electron-packager 5.1
+// Type definitions for electron-packager 8.7
 // Project: https://github.com/electron-userland/electron-packager
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT/>
 //                 Juan Jimenez-Anca <https://github.com/cortopy>
@@ -18,88 +18,187 @@ export = electronPackager;
  * @param opts - Options to configure packaging.
  * @param callback - Callback which is called when packaging is done or an error occured.
  */
-declare function electronPackager(opts: electronPackager.Options, callback: electronPackager.Callback): void;
+declare function electronPackager(opts: electronPackager.Options, callback: electronPackager.finalCallback): void;
 
 declare namespace electronPackager {
-    type ignoreFunction = (path: string) => boolean;
-    /** Electron-packager Options. */
-    interface Options {
-        /** The source directory. */
-        dir: string;
-        /** The application name. */
-        name: string;
-        /**
-         * Allowed values: linux, win32, darwin, all. Not required if `all` is used.
-         * Arbitrary combinations of individual platforms are also supported via a comma-delimited string or array of strings.
-         */
-        platform?: string | string[];
-        /** Allowed values: ia32, x64, all Not required if `all` is used. */
-        arch?: string;
-        /** Electron version (without the "v"). See https://github.com/atom/electron/releases. */
-        version: string;
-
-        /** Shortcut for `--arch=all --platform=all`. */
-        all?: boolean;
-        /** The output directory. */
-        out?: string;
-        /**
-         * Currently you must look for conversion tools in order to supply an icon in the format required by the platform:
-         * - OS X: `.icns`
-         * - Windows: `.ico`
-         *
-         * For Linux builds, this option is not required, as the dock/window list icon is set via the icon option in the BrowserWindow contructor.
-         * Setting the icon in the file manager is not currently supported.
-         *
-         * If the file extension is omitted, it is auto-completed to the correct extension based on the platform,
-         * including when `--platform=all` is in effect.
-         */
-        icon?: string;
-
-        /** The bundle identifier to use in the app plist. */
-        "app-bundle-id"?: string;
-        /** The release version to set for the app. */
-        "app-version"?: string;
-        /** The build version to set for the app (OS X only). */
-        "build-version"?: string;
-        /** The bundle identifier to use in the app helper plist. */
-        "helper-bundle-id"?: string;
-        /** Object hash of application metadata to embed into the executable (Windows only). */
-        "version-string"?: VersionString;
-
-        /** The directory of cached electron downloads. Defaults to "$HOME/.electron". */
-        cache?: string;
-        /** Do not copy files into App whose filenames regex .match this string. */
-        ignore?: RegExp | RegExp[] | ignoreFunction;
-        /** Runs `npm prune --production` on the app. */
-        prune?: boolean;
-        /** If output directory for a platform already exists, replaces it rather than skipping it. */
-        overwrite?: boolean;
-        /** Packages the source code within your app into an archive. */
-        asar?: boolean;
-        /** Unpacks the files to app.asar.unpacked directory whose filenames regex .match this string. */
-        "asar-unpack"?: string;
-        /** Should contain the identity to be used when running `codesign` (OS X only). */
-        sign?: string;
-    }
-
-    /** Object hash of application metadata to embed into the executable (Windows only). */
-    interface VersionString {
-        CompanyName?: string;
-        LegalCopyright?: string;
-        FileDescription?: string;
-        OriginalFilename?: string;
-        FileVersion?: string;
-        ProductVersion?: string;
-        ProductName?: string;
-        InternalName?: string;
-    }
-
-    /** Electron-packager done callback. */
     /**
      * Callback which is called when electron-packager is done.
      *
      * @param err - Contains errors if any.
-     * @param appPath - Path(s) to the newly created application(s).
+     * @param appPaths - Path(s) to the newly created application(s).
      */
-    type Callback = (err: Error, appPath: string|string[]) => void;
+    type finalCallback = (err: Error, appPaths: string|string[]) => void;
+
+    type ignoreFunction = (path: string) => boolean;
+    type onCompleteFn = (buildPath: string, electronVersion: string, platform: string, arch: string, callbackFn: () => void) => void;
+    type arch = "ia32" | "x64" | "armv7l" | "all";
+    type packageManager = "npm" | "cnpm" | "yarn";
+    type platform = "linux" | "win32" | "darwin" | "mas" | "all";
+
+    interface AsarOptions {
+        ordering?: string;
+        unpack?: string;
+        unpackDir?: string;
+    }
+
+    interface ElectronDownloadOptions {
+        cache?: string;
+        mirror?: string;
+        quiet?: boolean;
+        strictSSL?: boolean;
+    }
+
+    interface ElectronOsXSignOptions {
+        identity?: string;
+        entitlements?: string;
+        "entitlements-inherit"?: string;
+    }
+
+    /**
+     * Object (also known as a "hash") of application metadata to embed into the executable
+     */
+    interface Win32Metadata {
+        CompanyName?: string;
+        FileDescription?: string;
+        OriginalFilename?: string;
+        ProductName?: string;
+        InternalName?: string;
+        "requested-execution-level": any;
+        "application-manifest": any;
+    }
+
+    /** Electron-packager Options. */
+    interface Options {
+        /** The source directory. */
+        dir: string;
+        /**
+         * Optional list of methods to call on completion of each process
+         */
+        afterCopy?: onCompleteFn[];
+        afterExtract?: onCompleteFn[];
+        afterPrune?: onCompleteFn[];
+        /** Shortcut for `--arch=all --platform=all`. */
+        all?: boolean;
+        /**
+         * The human-readable copyright line for the app. Maps to the LegalCopyright metadata property on Windows, and NSHumanReadableCopyright on OS X.
+         */
+        appCopyright?: string;
+        /**
+         * The release version of the application. By default the version property in the package.json is used but it can be overridden with this argument.
+         * If neither are provided, the version of Electron will be used. Maps to the ProductVersion metadata property on Windows, and CFBundleShortVersionString on OS X.
+         */
+        appVersion?: string;
+        /**
+         * The target system architecture(s) to build for. Not required if the all option is set.
+         * If arch is set to all, all supported architectures for the target platforms specified by platform will be built.
+         * Arbitrary combinations of individual architectures are also supported via a comma-delimited string or array of strings.
+         * The non-all values correspond to the architecture names used by Electron releases. This value is not restricted to the official set if download.mirror is set.
+         */
+        arch?: arch;
+        /**
+         * Whether to package the application's source code into an archive, using Electron's archive format
+         */
+        asar?: boolean | AsarOptions;
+        /**
+         * The build version of the application. Defaults to the value of appVersion.
+         * Maps to the FileVersion metadata property on Windows, and CFBundleVersion on OS X.
+         */
+        buildVersion?: string;
+        /**
+         * Whether symlinks should be dereferenced during the copying of the application source.
+         */
+        derefSymlinks?: boolean;
+        /**
+         * If present, passes custom options to electron-download
+         */
+        download?: ElectronDownloadOptions;
+        /**
+         * The Electron version with which the app is built (without the leading 'v') - for example, 1.4.13
+         */
+        electronVersion?: string;
+        /**
+         * One or more files to be copied directly into the app's Contents/Resources directory for OS X target platforms, and the resources directory for other target platforms.
+         */
+        extraResource?: string | string[];
+        /**
+         * The local path to the icon file, if the target platform supports setting embedding an icon.
+         */
+        icon?: string;
+        /**
+         * One or more additional regular expression patterns which specify which files to ignore when copying files to create the app bundle(s).
+         * The regular expressions are matched against the absolute path of a given file/directory to be copied.
+         */
+        ignore?: RegExp | RegExp[] | ignoreFunction;
+        /**
+         * The application name. If omitted, it will use the productName or name value from the nearest package.json
+         */
+        name?: string;
+        /** The output directory. */
+        out?: string;
+        /**
+         * Whether to replace an already existing output directory for a given platform (true) or skip recreating it (false).
+         */
+        overwrite?: boolean;
+        /**
+         * The package manager used to prune devDependencies modules from the outputted Electron app
+         */
+        packageManager?: packageManager;
+        /**
+         * The target platform(s) to build for. Not required if the all option is set.
+         */
+        platform?: platform;
+        /**
+         * Runs the package manager command to remove all of the packages specified in the devDependencies section of package.json from the outputted Electron app.
+         */
+        prune?: boolean;
+        /**
+         * If true, disables printing informational and warning messages to the console when packaging the application. This does not disable errors.
+         */
+        quiet?: boolean;
+        /**
+         * The base directory to use as a temp directory. Set to false to disable use of a temporary directory.
+         */
+        tmpdir?: string | false;
+
+        /**
+         * OS X/Mac App Store targets only
+         */
+
+        /**
+         * The bundle identifier to use in the application's plist.
+         */
+        appBundleId?: string;
+        /**
+         * The application category type, as shown in the Finder via View → Arrange by Application Category when viewing the Applications directory.
+         */
+        appCategoryType?: string;
+        /**
+         * When the value is a String, the filename of a plist file. Its contents are added to the app's plist.
+         * When the value is an Object, an already-parsed plist data structure that is merged into the app's plist.
+         */
+        extendInfo?: string | {[property: string]: any};
+        /**
+         * The bundle identifier to use in the application helper's plist.
+         */
+        helperBundleId?: string;
+        /**
+         * If present, signs OS X target apps when the host platform is OS X and XCode is installed.
+         */
+        osxSign?: boolean | ElectronOsXSignOptions;
+        /**
+         * The URL protocol scheme(s) to associate the app with
+         */
+        protocol?: string;
+        /**
+         * The descriptive name(s) of the URL protocol scheme(s) specified via the protocol option.
+         * Maps to the CFBundleURLName metadata property.
+         */
+        protocolName?: string[];
+
+        /**
+         * Windows targets only
+         */
+
+        win32metadata?: Win32Metadata;
+    }
 }

From a0426430da440683c328f9053d85d1b413d311b7 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 17:22:06 -0400
Subject: [PATCH 062/287] [jquery] Clean up promises.

---
 types/jquery/index.d.ts      | 143 +++++++-----
 types/jquery/jquery-tests.ts | 421 ++++++++++++++++++++++++++++++++---
 2 files changed, 474 insertions(+), 90 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index ebedbe2530..278cc38d82 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3274,12 +3274,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1 = any, TN1 = any,
-        UR1 = any, UJ1 = any, UN1 = any,
-        VR1 = any, VJ1 = any, VN1 = any>
-        (deferredT: JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1,
-         deferredU: JQuery.Promise<UR1, UJ1, UN1> | JQuery.Thenable<UR1> | UR1,
-         deferredV: JQuery.Promise<VR1, VJ1, VN1> | JQuery.Thenable<VR1> | VR1): JQuery.Promise3<TR1, TJ1, never,
+    when<TR1, UR1, VR1,
+        TJ1 = any, UJ1 = any, VJ1 = any>
+        (deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1,
+         deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1,
+         deferredV: JQuery.Promise<VR1, VJ1, any> | JQuery.Thenable<VR1> | VR1): JQuery.Promise3<TR1, TJ1, never,
         UR1, UJ1, never,
         VR1, VJ1, never>;
     /**
@@ -3289,21 +3288,21 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1, TN1,
-        TR2, TJ2, TN2,
-        TR3 = never, TJ3 = never, TN3 = never,
-        UR1 = never, UJ1 = never, UN1 = never,
-        UR2 = never, UJ2 = never, UN2 = never,
-        UR3 = never, UJ3 = never, UN3 = never,
-        VR1 = never, VJ1 = never, VN1 = never,
-        VR2 = never, VJ2 = never, VN2 = never,
-        VR3 = never, VJ3 = never, VN3 = never>
-        (deferredT: JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3> |
-             JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>,
-         deferredU: JQuery.Promise3<UR1, UJ1, UN1, UR2, UJ2, UN2, UR3, UJ3, UN3> |
-             JQuery.Promise2<UR1, UJ1, UN1, UR2, UJ2, UN2>,
-         deferredV: JQuery.Promise3<VR1, VJ1, VN1, VR2, VJ2, VN2, VR3, VJ3, VN3> |
-             JQuery.Promise2<VR1, VJ1, VN1, VR2, VJ2, VN2>): JQuery.Promise3<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], never,
+    when<TR1, TJ1,
+        UR1, UJ1,
+        VR1, VJ1,
+        TR2, TJ2,
+        UR2, UJ2,
+        VR2, VJ2,
+        TR3 = never, TJ3 = never,
+        UR3 = never, UJ3 = never,
+        VR3 = never, VJ3 = never>
+        (deferredT: JQuery.Promise3<TR1, TJ1, any, TR2, TJ2, any, TR3, TJ3, any> |
+             JQuery.Promise2<TR1, TJ1, any, TR2, TJ2, any>,
+         deferredU: JQuery.Promise3<UR1, UJ1, any, UR2, UJ2, any, UR3, UJ3, any> |
+             JQuery.Promise2<UR1, UJ1, any, UR2, UJ2, any>,
+         deferredV: JQuery.Promise3<VR1, VJ1, any, VR2, VJ2, any, VR3, VJ3, any> |
+             JQuery.Promise2<VR1, VJ1, any, VR2, VJ2, any>): JQuery.Promise3<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], never,
         [UR1, UR2, UR3], [UJ1, UJ2, UJ3], never,
         [VR1, VR2, VR3], [VJ1, VJ2, VJ3], never>;
     /**
@@ -3313,10 +3312,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1 = any, TN1 = any,
-        UR1 = any, UJ1 = any, UN1 = any>
-        (deferredT: JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1,
-         deferredU: JQuery.Promise<UR1, UJ1, UN1> | JQuery.Thenable<UR1> | UR1): JQuery.Promise2<TR1, TJ1, never,
+    when<TR1, UR1,
+        TJ1 = any, UJ1 = any>
+        (deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1,
+         deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1): JQuery.Promise2<TR1, TJ1, never,
         UR1, UJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
@@ -3325,16 +3324,16 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1, TN1,
-        TR2, TJ2, TN2,
-        TR3 = never, TJ3 = never, TN3 = never,
-        UR1 = never, UJ1 = never, UN1 = never,
-        UR2 = never, UJ2 = never, UN2 = never,
-        UR3 = never, UJ3 = never, UN3 = never>
-        (deferredT: JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3> |
-             JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>,
-         deferredU: JQuery.Promise3<UR1, UJ1, UN1, UR2, UJ2, UN2, UR3, UJ3, UN3> |
-             JQuery.Promise2<UR1, UJ1, UN1, UR2, UJ2, UN2>): JQuery.Promise2<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], never,
+    when<TR1, TJ1,
+        UR1, UJ1,
+        TR2, TJ2,
+        UR2, UJ2,
+        TR3 = never, TJ3 = never,
+        UR3 = never, UJ3 = never>
+        (deferredT: JQuery.Promise3<TR1, TJ1, any, TR2, TJ2, any, TR3, TJ3, any> |
+             JQuery.Promise2<TR1, TJ1, any, TR2, TJ2, any>,
+         deferredU: JQuery.Promise3<UR1, UJ1, any, UR2, UJ2, any, UR3, UJ3, any> |
+             JQuery.Promise2<UR1, UJ1, any, UR2, UJ2, any>): JQuery.Promise2<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], never,
         [UR1, UR2, UR3], [UJ1, UJ2, UJ3], never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
@@ -3343,7 +3342,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1 = any, TN1 = any>(deferred: JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1): JQuery.Promise<TR1, TJ1, never>;
+    when<TR1, TJ1 = any>(deferred: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1): JQuery.Promise<TR1, TJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3351,11 +3350,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1, TN1,
-        TR2, TJ2, TN2,
-        TR3 = never, TJ3 = never, TN3 = never>
-        (deferredT: JQuery.Promise3<TR1, TJ1, TN1, TR2, TJ2, TN2, TR3, TJ3, TN3> |
-            JQuery.Promise2<TR1, TJ1, TN1, TR2, TJ2, TN2>): JQuery.Promise3<TR1, TJ1, never, TR2, TJ2, never, TR3, TJ3, never>;
+    when<TR1, TJ1,
+        TR2, TJ2,
+        TR3 = never, TJ3 = never>
+        (deferredT: JQuery.Promise3<TR1, TJ1, any, TR2, TJ2, any, TR3, TJ3, any> |
+            JQuery.Promise2<TR1, TJ1, any, TR2, TJ2, any>): JQuery.Promise3<TR1, TJ1, never, TR2, TJ2, never, TR3, TJ3, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3364,7 +3363,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1 = never, TJ1 = never, TN1 = never>(...deferreds: Array<JQuery.Promise<TR1, TJ1, TN1> | JQuery.Thenable<TR1> | TR1>): JQuery.Promise<TR1, TJ1, never>;
+    when<TR1 = never, TJ1 = never>(...deferreds: Array<JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1>): JQuery.Promise<TR1, TJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -4794,7 +4793,8 @@ declare namespace JQuery {
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN,
             CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = VN, CN2 = VN>
             (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2,
+             progressFilter?: null): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
             CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
         /**
@@ -4811,7 +4811,8 @@ declare namespace JQuery {
             BR = never, BJ = never, BN = UN,
             CR = never, CJ = never, CN = VN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR,
+             progressFilter?: null): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -4824,7 +4825,9 @@ declare namespace JQuery {
         pipe<AR, AJ = TJ, AN = TN,
             BR = never, BJ = UJ, BN = UN,
             CR = never, CJ = VJ, CN = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+            (doneFilter: ((t: TR, u: UR, v: VR) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR) | null,
+             failFilter?: null,
+             progressFilter?: null): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
 
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -4904,7 +4907,8 @@ declare namespace JQuery {
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN,
             CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = VN, CN2 = VN>
             (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2,
+             progressFilter?: null): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
             CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
         /**
@@ -4919,7 +4923,8 @@ declare namespace JQuery {
             BR = never, BJ = never, BN = UN,
             CR = never, CJ = never, CN = VN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR,
+             progressFilter?: null): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -4930,7 +4935,9 @@ declare namespace JQuery {
         then<AR, AJ = TJ, AN = TN,
             BR = never, BJ = UJ, BN = UN,
             CR = never, CJ = VJ, CN = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+            (doneFilter: ((t: TR, u: UR, v: VR) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR) | null,
+             failFilter?: null,
+             progressFilter?: null): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
     }
 
     /**
@@ -5096,7 +5103,8 @@ declare namespace JQuery {
         pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN>
             (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2,
+             progressFilter?: null): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -5111,7 +5119,8 @@ declare namespace JQuery {
         pipe<AR, AJ = never, AN = TN,
             BR = never, BJ = never, BN = UN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
+             failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR,
+             progressFilter?: null): Promise2<AR, AJ, AN, BR, BJ, BN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5123,7 +5132,9 @@ declare namespace JQuery {
          */
         pipe<AR, AJ = TJ, AN = TN,
             BR = never, BJ = UJ, BN = UN>
-            (doneFilter: (t: TR, u: UR) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
+            (doneFilter: ((t: TR, u: UR) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR) | null,
+             failFilter?: null,
+             progressFilter?: null): Promise2<AR, AJ, AN, BR, BJ, BN>;
 
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5195,7 +5206,8 @@ declare namespace JQuery {
         then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
             BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN>
             (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
+             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2,
+             progressFilter?: null): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
             BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5208,7 +5220,8 @@ declare namespace JQuery {
         then<AR, AJ = never, AN = TN,
             BR = never, BJ = never, BN = UN>
             (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
+             failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR,
+             progressFilter?: null): Promise2<AR, AJ, AN, BR, BJ, BN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5218,7 +5231,9 @@ declare namespace JQuery {
          */
         then<AR, AJ = TJ, AN = TN,
             BR = never, BJ = UJ, BN = UN>
-            (doneFilter: (t: TR, u: UR) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
+            (doneFilter: ((t: TR, u: UR) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR) | null,
+             failFilter?: null,
+             progressFilter?: null): Promise2<AR, AJ, AN, BR, BJ, BN>;
     }
 
     /**
@@ -5373,7 +5388,8 @@ declare namespace JQuery {
          */
         pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
             (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
+             progressFilter?: null): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5386,7 +5402,8 @@ declare namespace JQuery {
          */
         pipe<AR, AJ = never, AN = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR,
+             progressFilter?: null): JQuery.Promise<AR, AJ, AN>;
         /**
          * Utility method to filter and/or chain Deferreds.
          *
@@ -5397,7 +5414,9 @@ declare namespace JQuery {
          * @deprecated 1.8
          */
         pipe<AR, AJ = TJ, AN = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
+            (doneFilter: ((...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR) | null,
+             failFilter?: null,
+             progressFilter?: null): JQuery.Promise<AR, AJ, AN>;
 
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -5461,7 +5480,8 @@ declare namespace JQuery {
          */
         then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
             (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
+             progressFilter?: null): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5472,7 +5492,8 @@ declare namespace JQuery {
          */
         then<AR, AJ = never, AN = TN>
             (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
+             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR,
+             progressFilter?: null): JQuery.Promise<AR, AJ, AN>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
          *
@@ -5481,7 +5502,9 @@ declare namespace JQuery {
          * @since 1.8
          */
         then<AR, AJ = TJ, AN = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
+            (doneFilter: ((...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR) | null,
+             failFilter?: null,
+             progressFilter?: null): JQuery.Promise<AR, AJ, AN>;
     }
 
     // endregion
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 5487fb5b38..6638f18c89 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -5400,51 +5400,161 @@ function jqXHR() {
     }
 }
 
-function Promise3() {
+function Promise3(p: JQuery.Promise3<string, Error, number, JQuery, string, boolean, any, Function, never>) {
     function then() {
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        }, (a, b, c) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+            c; // $ExpectType Function
+        }, (a, b, c) => {
+            a; // $ExpectType number
+            b; // $ExpectType boolean
+            c; // $ExpectType never
+        });
+
+        p.then(null, (a, b, c) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+            c; // $ExpectType Function
+        }, (a, b, c) => {
+            a; // $ExpectType number
+            b; // $ExpectType boolean
+            c; // $ExpectType never
+        });
+
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        }, null, (a, b, c) => {
+            a; // $ExpectType number
+            b; // $ExpectType boolean
+            c; // $ExpectType never
+        });
+
+        p.then(null, null, (a, b, c) => {
+            a; // $ExpectType number
+            b; // $ExpectType boolean
+            c; // $ExpectType never
+        });
+
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        }, (a, b, c) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+            c; // $ExpectType Function
+        });
+
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        }, (a, b, c) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+            c; // $ExpectType Function
+        }, null);
+
+        p.then(null, (a, b, c) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+            c; // $ExpectType Function
+        });
+
+        p.then(null, (a, b, c) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+            c; // $ExpectType Function
+        }, null);
+
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        });
+
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        }, null);
+
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        }, null, null);
+
+        p.then(null);
+
+        p.then(null, null);
+
+        p.then(null, null, null);
+
         function doneFilter() {
-            // $ExpectType Promise3<number, jqXHR<any>, never, never, ErrorTextStatus, never, never, string, never>
-            $.ajax('/echo/json').then(() => {
+            p.then(() => {
                 return 1;
+            }).then((a) => {
+                a; // $ExpectType number
             });
 
-            // $ExpectType Promise3<string, jqXHR<any>, never, never, ErrorTextStatus, never, never, string, never>
-            $.ajax('/echo/json').then(() => {
-                const t: JQuery.Thenable<string> = {
-                    then() {
-                        return Promise.resolve('myValue');
-                    }
-                };
-
-                return t;
+            p.then(() => {
+                return $.ready;
+            }).then((a) => {
+                a; // $ExpectType JQueryStatic<HTMLElement>
             });
 
-            // $ExpectType Promise3<any, jqXHR<any>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<any>, string, never>
-            $.ajax('/echo/json').then(() => {
-                return $.ajax('/echo/json');
+            p.then(() => {
+                return p;
+            }).then((a, b, c) => {
+                a; // $ExpectType string
+                b; // $ExpectType JQuery<HTMLElement>
+                c; // $ExpectType any
+            }, (a, b, c) => {
+                a; // $ExpectType Error
+                b; // $ExpectType string
+                c; // $ExpectType Function
+            }, (a, b, c) => {
+                a; // $ExpectType number
+                b; // $ExpectType boolean
+                c; // $ExpectType never
             });
         }
 
-        function null_failFilter() {
-            // $ExpectType Promise3<number, never, never, never, never, never, never, never, never>
-            $.ajax('/echo/json').then(null, () => {
+        function failFilter() {
+            p.then(null, () => {
                 return 1;
+            }).then((a) => {
+                a; // $ExpectType number
             });
 
-            // $ExpectType Promise3<string, never, never, never, never, never, never, never, never>
-            $.ajax('/echo/json').then(null, () => {
-                const t: JQuery.Thenable<string> = {
-                    then() {
-                        return Promise.resolve('myValue');
-                    }
-                };
-
-                return t;
+            p.then(null, () => {
+                return $.ready;
+            }).then((a) => {
+                a; // $ExpectType JQueryStatic<HTMLElement>
             });
 
-            // $ExpectType Promise3<any, jqXHR<any>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<any>, string, never>
-            $.ajax('/echo/json').then(null, () => {
-                return $.ajax('/echo/json');
+            p.then(null, () => {
+                return p;
+            }).then((a, b, c) => {
+                a; // $ExpectType string
+                b; // $ExpectType JQuery<HTMLElement>
+                c; // $ExpectType any
+            }, (a, b, c) => {
+                a; // $ExpectType Error
+                b; // $ExpectType string
+                c; // $ExpectType Function
+            }, (a, b, c) => {
+                a; // $ExpectType number
+                b; // $ExpectType boolean
+                c; // $ExpectType never
             });
         }
 
@@ -5517,3 +5627,254 @@ function Promise3() {
         });
     }
 }
+
+function Promise2(p: JQuery.Promise2<string, Error, number, JQuery, string, boolean>) {
+    function then() {
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        }, (a, b) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+        }, (a, b) => {
+            a; // $ExpectType number
+            b; // $ExpectType boolean
+        });
+
+        p.then(null, (a, b) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+        }, (a, b) => {
+            a; // $ExpectType number
+            b; // $ExpectType boolean
+        });
+
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        }, null, (a, b) => {
+            a; // $ExpectType number
+            b; // $ExpectType boolean
+        });
+
+        p.then(null, null, (a, b) => {
+            a; // $ExpectType number
+            b; // $ExpectType boolean
+        });
+
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        }, (a, b) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+        });
+
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        }, (a, b) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+        }, null);
+
+        p.then(null, (a, b) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+        });
+
+        p.then(null, (a, b) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+        }, null);
+
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        });
+
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        }, null);
+
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        }, null, null);
+
+        p.then(null);
+
+        p.then(null, null);
+
+        p.then(null, null, null);
+
+        function doneFilter() {
+            p.then(() => {
+                return 1;
+            }).then((a) => {
+                a; // $ExpectType number
+            });
+
+            p.then(() => {
+                return $.ready;
+            }).then((a) => {
+                a; // $ExpectType JQueryStatic<HTMLElement>
+            });
+
+            p.then(() => {
+                return p;
+            }).then((a, b) => {
+                a; // $ExpectType string
+                b; // $ExpectType JQuery<HTMLElement>
+            }, (a, b) => {
+                a; // $ExpectType Error
+                b; // $ExpectType string
+            }, (a, b) => {
+                a; // $ExpectType number
+                b; // $ExpectType boolean
+            });
+        }
+
+        function failFilter() {
+            p.then(null, () => {
+                return 1;
+            }).then((a) => {
+                a; // $ExpectType number
+            });
+
+            p.then(null, () => {
+                return $.ready;
+            }).then((a) => {
+                a; // $ExpectType JQueryStatic<HTMLElement>
+            });
+
+            p.then(null, () => {
+                return p;
+            }).then((a, b) => {
+                a; // $ExpectType string
+                b; // $ExpectType JQuery<HTMLElement>
+            }, (a, b) => {
+                a; // $ExpectType Error
+                b; // $ExpectType string
+            }, (a, b) => {
+                a; // $ExpectType number
+                b; // $ExpectType boolean
+            });
+        }
+    }
+}
+
+function _Promise(p: JQuery.Promise<string, Error, number>) {
+    function then() {
+        p.then((a) => {
+            a; // $ExpectType string
+        }, (a) => {
+            a; // $ExpectType Error
+        }, (a) => {
+            a; // $ExpectType number
+        });
+
+        p.then(null, (a) => {
+            a; // $ExpectType Error
+        }, (a) => {
+            a; // $ExpectType number
+        });
+
+        p.then((a) => {
+            a; // $ExpectType string
+        }, null, (a) => {
+            a; // $ExpectType number
+        });
+
+        p.then(null, null, (a) => {
+            a; // $ExpectType number
+        });
+
+        p.then((a) => {
+            a; // $ExpectType string
+        }, (a) => {
+            a; // $ExpectType Error
+        });
+
+        p.then((a) => {
+            a; // $ExpectType string
+        }, (a) => {
+            a; // $ExpectType Error
+        }, null);
+
+        p.then(null, (a) => {
+            a; // $ExpectType Error
+        });
+
+        p.then(null, (a) => {
+            a; // $ExpectType Error
+        }, null);
+
+        p.then((a) => {
+            a; // $ExpectType string
+        });
+
+        p.then((a) => {
+            a; // $ExpectType string
+        }, null);
+
+        p.then((a) => {
+            a; // $ExpectType string
+        }, null, null);
+
+        p.then(null);
+
+        p.then(null, null);
+
+        p.then(null, null, null);
+
+        function doneFilter() {
+            p.then(() => {
+                return 1;
+            }).then((a) => {
+                a; // $ExpectType number
+            });
+
+            p.then(() => {
+                return $.ready;
+            }).then((a) => {
+                a; // $ExpectType JQueryStatic<HTMLElement>
+            });
+
+            p.then(() => {
+                return p;
+            }).then((a) => {
+                a; // $ExpectType string
+            }, (a) => {
+                a; // $ExpectType Error
+            }, (a) => {
+                a; // $ExpectType number
+            });
+        }
+
+        function failFilter() {
+            p.then(null, () => {
+                return 1;
+            }).then((a) => {
+                a; // $ExpectType number
+            });
+
+            p.then(null, () => {
+                return $.ready;
+            }).then((a) => {
+                a; // $ExpectType JQueryStatic<HTMLElement>
+            });
+
+            p.then(null, () => {
+                return p;
+            }).then((a) => {
+                a; // $ExpectType string
+            }, (a) => {
+                a; // $ExpectType Error
+            }, (a) => {
+                a; // $ExpectType number
+            });
+        }
+    }
+}

From c26957ea20882c5b804659d1c9349b2968eebd93 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 27 Jun 2017 02:55:43 +0200
Subject: [PATCH 063/287] dtslint fixes

---
 types/activex-adodb/index.d.ts     | 260 +++++++++++++++--------------
 types/activex-scripting/index.d.ts |  97 ++++++-----
 types/activex-wia/index.d.ts       | 137 ++++++++-------
 3 files changed, 253 insertions(+), 241 deletions(-)

diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 8d27b7c706..28e7d7f8ff 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,10 +1,4 @@
-// Type definitions for Microsoft ActiveX Data Objects
-// Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
-// Definitions by: Zev Spitz <https://github.com/zspitz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 declare namespace ADODB {
-
     const enum ADCPROP_ASYNCTHREADPRIORITY_ENUM {
         adPriorityAboveNormal = 4,
         adPriorityBelowNormal = 2,
@@ -601,18 +595,18 @@ declare namespace ADODB {
         CommandText: string;
         CommandTimeout: number;
         CommandType: CommandTypeEnum;
-        
+
         /**
-        * @param string [Name='']
-        * @param ADODB.DataTypeEnum [Type=0]
-        * @param ADODB.ParameterDirectionEnum [Direction=1]
-        * @param number [Size=0]
-        */
+         * @param string [Name='']
+         * @param ADODB.DataTypeEnum [Type=0]
+         * @param ADODB.ParameterDirectionEnum [Direction=1]
+         * @param number [Size=0]
+         */
         CreateParameter(Name?: string, Type?: DataTypeEnum, Direction?: ParameterDirectionEnum, Size?: number, Value?: any): Parameter;
         Dialect: string;
-        
+
         /** @param number [Options=-1] */
-        Execute(RecordsAffected?: any, Parameters?: any[], Options?: number): Recordset;
+        Execute(RecordsAffected?: any, Parameters?: any, Options?: number): Recordset;
         Name: string;
         NamedParameters: boolean;
         readonly Parameters: Parameters;
@@ -633,18 +627,18 @@ declare namespace ADODB {
         CursorLocation: CursorLocationEnum;
         DefaultDatabase: string;
         readonly Errors: Errors;
-        
+
         /** @param number [Options=-1] */
         Execute(CommandText: string, RecordsAffected: any, Options?: number): Recordset;
         IsolationLevel: IsolationLevelEnum;
         Mode: ConnectModeEnum;
-        
+
         /**
-        * @param string [ConnectionString='']
-        * @param string [UserID='']
-        * @param string [Password='']
-        * @param number [Options=-1]
-        */
+         * @param string [ConnectionString='']
+         * @param string [UserID='']
+         * @param string [Password='']
+         * @param number [Options=-1]
+         */
         Open(ConnectionString?: string, UserID?: string, Password?: string, Options?: number): void;
         OpenSchema(Schema: SchemaEnum, Restrictions?: any, SchemaID?: any): Recordset;
         readonly Properties: Properties;
@@ -690,24 +684,23 @@ declare namespace ADODB {
     }
 
     interface Fields {
-        
         /**
-        * @param number [DefinedSize=0]
-        * @param ADODB.FieldAttributeEnum [Attrib=-1]
-        */
+         * @param number [DefinedSize=0]
+         * @param ADODB.FieldAttributeEnum [Attrib=-1]
+         */
         _Append(Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum): void;
-        
+
         /**
-        * @param number [DefinedSize=0]
-        * @param ADODB.FieldAttributeEnum [Attrib=-1]
-        */
+         * @param number [DefinedSize=0]
+         * @param ADODB.FieldAttributeEnum [Attrib=-1]
+         */
         Append(Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum, FieldValue?: any): void;
         CancelUpdate(): void;
         readonly Count: number;
         Delete(Index: any): void;
         Item(Index: any): Field;
         Refresh(): void;
-        
+
         /** @param ADODB.ResyncEnum [ResyncValues=2] */
         Resync(ResyncValues?: ResyncEnum): void;
         Update(): void;
@@ -751,43 +744,43 @@ declare namespace ADODB {
         ActiveConnection: any;
         Cancel(): void;
         Close(): void;
-        
+
         /**
-        * @param string [Source='']
-        * @param string [Destination='']
-        * @param string [UserName='']
-        * @param string [Password='']
-        * @param ADODB.CopyRecordOptionsEnum [Options=-1]
-        * @param boolean [Async=false]
-        */
+         * @param string [Source='']
+         * @param string [Destination='']
+         * @param string [UserName='']
+         * @param string [Password='']
+         * @param ADODB.CopyRecordOptionsEnum [Options=-1]
+         * @param boolean [Async=false]
+         */
         CopyRecord(Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: CopyRecordOptionsEnum, Async?: boolean): string;
-        
+
         /**
-        * @param string [Source='']
-        * @param boolean [Async=false]
-        */
+         * @param string [Source='']
+         * @param boolean [Async=false]
+         */
         DeleteRecord(Source?: string, Async?: boolean): void;
         readonly Fields: Fields;
         GetChildren(): Recordset;
         Mode: ConnectModeEnum;
-        
+
         /**
-        * @param string [Source='']
-        * @param string [Destination='']
-        * @param string [UserName='']
-        * @param string [Password='']
-        * @param ADODB.MoveRecordOptionsEnum [Options=-1]
-        * @param boolean [Async=false]
-        */
+         * @param string [Source='']
+         * @param string [Destination='']
+         * @param string [UserName='']
+         * @param string [Password='']
+         * @param ADODB.MoveRecordOptionsEnum [Options=-1]
+         * @param boolean [Async=false]
+         */
         MoveRecord(Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: MoveRecordOptionsEnum, Async?: boolean): string;
-        
+
         /**
-        * @param ADODB.ConnectModeEnum [Mode=0]
-        * @param ADODB.RecordCreateOptionsEnum [CreateOptions=-1]
-        * @param ADODB.RecordOpenOptionsEnum [Options=-1]
-        * @param string [UserName='']
-        * @param string [Password='']
-        */
+         * @param ADODB.ConnectModeEnum [Mode=0]
+         * @param ADODB.RecordCreateOptionsEnum [CreateOptions=-1]
+         * @param ADODB.RecordOpenOptionsEnum [Options=-1]
+         * @param string [UserName='']
+         * @param string [Password='']
+         */
         Open(Source: any, ActiveConnection: any, Mode?: ConnectModeEnum, CreateOptions?: RecordCreateOptionsEnum, Options?: RecordOpenOptionsEnum, UserName?: string, Password?: string): void;
         readonly ParentURL: string;
         readonly Properties: Properties;
@@ -798,14 +791,14 @@ declare namespace ADODB {
 
     interface Recordset {
         _xClone(): Recordset;
-        
+
         /** @param ADODB.AffectEnum [AffectRecords=3] */
         _xResync(AffectRecords?: AffectEnum): void;
-        
+
         /**
-        * @param string [FileName='']
-        * @param ADODB.PersistFormatEnum [PersistFormat=0]
-        */
+         * @param string [FileName='']
+         * @param ADODB.PersistFormatEnum [PersistFormat=0]
+         */
         _xSave(FileName?: string, PersistFormat?: PersistFormatEnum): void;
         AbsolutePage: PositionEnum;
         AbsolutePosition: PositionEnum;
@@ -816,11 +809,11 @@ declare namespace ADODB {
         Bookmark: any;
         CacheSize: number;
         Cancel(): void;
-        
+
         /** @param ADODB.AffectEnum [AffectRecords=3] */
         CancelBatch(AffectRecords?: AffectEnum): void;
         CancelUpdate(): void;
-        
+
         /** @param ADODB.LockTypeEnum [LockType=-1] */
         Clone(LockType?: LockTypeEnum): Recordset;
         Close(): void;
@@ -830,30 +823,30 @@ declare namespace ADODB {
         CursorType: CursorTypeEnum;
         DataMember: string;
         DataSource: any;
-        
+
         /** @param ADODB.AffectEnum [AffectRecords=1] */
         Delete(AffectRecords?: AffectEnum): void;
         readonly EditMode: EditModeEnum;
         readonly EOF: boolean;
         readonly Fields: Fields;
         Filter: any;
-        
+
         /**
-        * @param number [SkipRecords=0]
-        * @param ADODB.SearchDirectionEnum [SearchDirection=1]
-        */
+         * @param number [SkipRecords=0]
+         * @param ADODB.SearchDirectionEnum [SearchDirection=1]
+         */
         Find(Criteria: string, SkipRecords?: number, SearchDirection?: SearchDirectionEnum, Start?: any): void;
-        
+
         /** @param number [Rows=-1] */
         GetRows(Rows?: number, Start?: any, Fields?: any): any;
-        
+
         /**
-        * @param ADODB.StringFormatEnum [StringFormat=2]
-        * @param number [NumRows=-1]
-        * @param string [ColumnDelimeter='']
-        * @param string [RowDelimeter='']
-        * @param string [NullExpr='']
-        */
+         * @param ADODB.StringFormatEnum [StringFormat=2]
+         * @param number [NumRows=-1]
+         * @param string [ColumnDelimeter='']
+         * @param string [RowDelimeter='']
+         * @param string [NullExpr='']
+         */
         GetString(StringFormat?: StringFormatEnum, NumRows?: number, ColumnDelimeter?: string, RowDelimeter?: string, NullExpr?: string): string;
         Index: string;
         LockType: LockTypeEnum;
@@ -865,30 +858,30 @@ declare namespace ADODB {
         MoveNext(): void;
         MovePrevious(): void;
         NextRecordset(RecordsAffected?: any): Recordset;
-        
+
         /**
-        * @param ADODB.CursorTypeEnum [CursorType=-1]
-        * @param ADODB.LockTypeEnum [LockType=-1]
-        * @param number [Options=-1]
-        */
+         * @param ADODB.CursorTypeEnum [CursorType=-1]
+         * @param ADODB.LockTypeEnum [LockType=-1]
+         * @param number [Options=-1]
+         */
         Open(Source: any, ActiveConnection: any, CursorType?: CursorTypeEnum, LockType?: LockTypeEnum, Options?: number): void;
         readonly PageCount: number;
         PageSize: number;
         readonly Properties: Properties;
         readonly RecordCount: number;
-        
+
         /** @param number [Options=-1] */
         Requery(Options?: number): void;
-        
+
         /**
-        * @param ADODB.AffectEnum [AffectRecords=3]
-        * @param ADODB.ResyncEnum [ResyncValues=2]
-        */
+         * @param ADODB.AffectEnum [AffectRecords=3]
+         * @param ADODB.ResyncEnum [ResyncValues=2]
+         */
         Resync(AffectRecords?: AffectEnum, ResyncValues?: ResyncEnum): void;
-        
+
         /** @param ADODB.PersistFormatEnum [PersistFormat=0] */
         Save(Destination: any, PersistFormat?: PersistFormatEnum): void;
-        
+
         /** @param ADODB.SeekEnum [SeekOption=1] */
         Seek(KeyValues: any, SeekOption?: SeekEnum): void;
         Sort: string;
@@ -898,7 +891,7 @@ declare namespace ADODB {
         StayInSync: boolean;
         Supports(CursorOptions: CursorOptionEnum): boolean;
         Update(Fields?: any, Values?: any): void;
-        
+
         /** @param ADODB.AffectEnum [AffectRecords=3] */
         UpdateBatch(AffectRecords?: AffectEnum): void;
     }
@@ -907,7 +900,7 @@ declare namespace ADODB {
         Cancel(): void;
         Charset: string;
         Close(): void;
-        
+
         /** @param number [CharNumber=-1] */
         CopyTo(DestStream: Stream, CharNumber?: number): void;
         readonly EOS: boolean;
@@ -915,22 +908,22 @@ declare namespace ADODB {
         LineSeparator: LineSeparatorEnum;
         LoadFromFile(FileName: string): void;
         Mode: ConnectModeEnum;
-        
+
         /**
-        * @param ADODB.ConnectModeEnum [Mode=0]
-        * @param ADODB.StreamOpenOptionsEnum [Options=-1]
-        * @param string [UserName='']
-        * @param string [Password='']
-        */
+         * @param ADODB.ConnectModeEnum [Mode=0]
+         * @param ADODB.StreamOpenOptionsEnum [Options=-1]
+         * @param string [UserName='']
+         * @param string [Password='']
+         */
         Open(Source: any, Mode?: ConnectModeEnum, Options?: StreamOpenOptionsEnum, UserName?: string, Password?: string): void;
         Position: number;
-        
+
         /** @param number [NumBytes=-1] */
         Read(NumBytes?: number): any;
-        
+
         /** @param number [NumChars=-1] */
         ReadText(NumChars?: number): string;
-        
+
         /** @param ADODB.SaveOptionsEnum [Options=1] */
         SaveToFile(FileName: string, Options?: SaveOptionsEnum): void;
         SetEOS(): void;
@@ -939,7 +932,7 @@ declare namespace ADODB {
         readonly State: ObjectStateEnum;
         Type: StreamTypeEnum;
         Write(Buffer: any): void;
-        
+
         /** @param ADODB.StreamWriteEnum [Options=0] */
         WriteText(Data: string, Options?: StreamWriteEnum): void;
     }
@@ -947,26 +940,48 @@ declare namespace ADODB {
 }
 
 interface ActiveXObject {
-    on(obj: ADODB.Connection, eventName: 'BeginTransComplete', eventArgs: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {TransactionLevel: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'CommitTransComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'ConnectComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'Disconnect', eventArgs: ['adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'ExecuteComplete', eventArgs: ['RecordsAffected', 'pError', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'], handler: (this: ADODB.Connection, parameter: {RecordsAffected: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'InfoMessage', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'RollbackTransComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'WillConnect', eventArgs: ['ConnectionString', 'UserID', 'Password', 'Options', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {ConnectionString: string, UserID: string, Password: string, Options: number, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'WillExecute', eventArgs: ['Source', 'CursorType', 'LockType', 'Options', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'], handler: (this: ADODB.Connection, parameter: {Source: string, CursorType: ADODB.CursorTypeEnum, LockType: ADODB.LockTypeEnum, Options: number, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'EndOfRecordset', eventArgs: ['fMoreData', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {fMoreData: boolean, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'FetchComplete', eventArgs: ['pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'FetchProgress', eventArgs: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {Progress: number, MaxProgress: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'FieldChangeComplete', eventArgs: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number, Fields: any, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'MoveComplete', eventArgs: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'RecordChangeComplete', eventArgs: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, cRecords: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'RecordsetChangeComplete', eventArgs: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'WillChangeField', eventArgs: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number, Fields: any, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'WillChangeRecord', eventArgs: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, cRecords: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'WillChangeRecordset', eventArgs: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'WillMove', eventArgs: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Connection, event: 'BeginTransComplete', argNames: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {
+        TransactionLevel: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'CommitTransComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'ConnectComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'Disconnect', argNames: ['adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum,
+         pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'ExecuteComplete', argNames: ['RecordsAffected', 'pError', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'],
+         handler: (this: ADODB.Connection, parameter: {RecordsAffected: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command,
+         pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'InfoMessage', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'RollbackTransComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'WillConnect', argNames: ['ConnectionString', 'UserID', 'Password', 'Options', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection,
+         parameter: {ConnectionString: string, UserID: string, Password: string, Options: number, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'WillExecute', argNames: ['Source', 'CursorType', 'LockType', 'Options', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'],
+         handler: (this: ADODB.Connection, parameter: {Source: string, CursorType: ADODB.CursorTypeEnum, LockType: ADODB.LockTypeEnum, Options: number,
+         adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Recordset, event: 'EndOfRecordset', argNames: ['fMoreData', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {fMoreData: boolean,
+         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FetchComplete', argNames: ['pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FetchProgress', argNames: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {Progress: number,
+         MaxProgress: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FieldChangeComplete', argNames: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        cFields: number, Fields: any, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'MoveComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'RecordChangeComplete', argNames: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, cRecords: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'RecordsetChangeComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeField', argNames: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number,
+         Fields: any, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeRecord', argNames: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, cRecords: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeRecordset', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillMove', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum,
+         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
     set(obj: ADODB.Recordset, propertyName: 'Collect', parameterTypes: [any], newValue: any): void;
     new(progid: 'ADODB.Command'): ADODB.Command;
     new(progid: 'ADODB.Connection'): ADODB.Connection;
@@ -981,5 +996,4 @@ interface EnumeratorConstructor {
     new(col: ADODB.Fields): ADODB.Field;
     new(col: ADODB.Parameters): ADODB.Parameter;
     new(col: ADODB.Properties): ADODB.Property;
-}
-
+}
\ No newline at end of file
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index 7911113175..1dd659fc7a 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -156,9 +156,9 @@ declare namespace Scripting {
         Attributes: FileAttribute;
         
         /**
-        * Copy this file
-        * @param boolean [OverWriteFiles=true]
-        */
+         * Copy this file
+         * @param boolean [OverWriteFiles=true]
+         */
         Copy(Destination: string, OverWriteFiles?: boolean): void;
         
         /** Date file was created */
@@ -171,9 +171,9 @@ declare namespace Scripting {
         readonly DateLastModified: VarDate;
         
         /**
-        * Delete this file
-        * @param boolean [Force=false]
-        */
+         * Delete this file
+         * @param boolean [Force=false]
+         */
         Delete(Force?: boolean): void;
         
         /** Get drive that contains file */
@@ -186,10 +186,10 @@ declare namespace Scripting {
         Name: string;
         
         /**
-        * Open a file as a TextStream
-        * @param Scripting.IOMode [IOMode=1]
-        * @param Scripting.Tristate [Format=0]
-        */
+         * Open a file as a TextStream
+         * @param Scripting.IOMode [IOMode=1]
+         * @param Scripting.Tristate [Format=0]
+         */
         OpenAsTextStream(IOMode?: IOMode, Format?: Tristate): TextStream;
         
         /** Get folder that contains file */
@@ -228,37 +228,37 @@ declare namespace Scripting {
         BuildPath(Path: string, Name: string): string;
         
         /**
-        * Copy a file
-        * @param boolean [OverWriteFiles=true]
-        */
+         * Copy a file
+         * @param boolean [OverWriteFiles=true]
+         */
         CopyFile(Source: string, Destination: string, OverWriteFiles?: boolean): void;
         
         /**
-        * Copy a folder
-        * @param boolean [OverWriteFiles=true]
-        */
+         * Copy a folder
+         * @param boolean [OverWriteFiles=true]
+         */
         CopyFolder(Source: string, Destination: string, OverWriteFiles?: boolean): void;
         
         /** Create a folder */
         CreateFolder(Path: string): Folder;
         
         /**
-        * Create a file as a TextStream
-        * @param boolean [Overwrite=true]
-        * @param boolean [Unicode=false]
-        */
+         * Create a file as a TextStream
+         * @param boolean [Overwrite=true]
+         * @param boolean [Unicode=false]
+         */
         CreateTextFile(FileName: string, Overwrite?: boolean, Unicode?: boolean): TextStream;
         
         /**
-        * Delete a file
-        * @param boolean [Force=false]
-        */
+         * Delete a file
+         * @param boolean [Force=false]
+         */
         DeleteFile(FileSpec: string, Force?: boolean): void;
         
         /**
-        * Delete a folder
-        * @param boolean [Force=false]
-        */
+         * Delete a folder
+         * @param boolean [Force=false]
+         */
         DeleteFolder(FolderSpec: string, Force?: boolean): void;
         
         /** Check if a drive or a share exists */
@@ -307,9 +307,9 @@ declare namespace Scripting {
         GetSpecialFolder(SpecialFolder: SpecialFolderConst): Folder;
         
         /**
-        * Retrieve the standard input, output or error stream
-        * @param boolean [Unicode=false]
-        */
+         * Retrieve the standard input, output or error stream
+         * @param boolean [Unicode=false]
+         */
         GetStandardStream(StandardStreamType: StandardStreamTypes, Unicode?: boolean): TextStream;
         
         /** Generate name that can be used to name a temporary file */
@@ -322,11 +322,11 @@ declare namespace Scripting {
         MoveFolder(Source: string, Destination: string): void;
         
         /**
-        * Open a file as a TextStream
-        * @param Scripting.IOMode [IOMode=1]
-        * @param boolean [Create=false]
-        * @param Scripting.Tristate [Format=0]
-        */
+         * Open a file as a TextStream
+         * @param Scripting.IOMode [IOMode=1]
+         * @param boolean [Create=false]
+         * @param Scripting.Tristate [Format=0]
+         */
         OpenTextFile(FileName: string, IOMode?: IOMode, Create?: boolean, Format?: Tristate): TextStream;
     }
 
@@ -337,16 +337,16 @@ declare namespace Scripting {
         Attributes: FileAttribute;
         
         /**
-        * Copy this folder
-        * @param boolean [OverWriteFiles=true]
-        */
+         * Copy this folder
+         * @param boolean [OverWriteFiles=true]
+         */
         Copy(Destination: string, OverWriteFiles?: boolean): void;
         
         /**
-        * Create a file as a TextStream
-        * @param boolean [Overwrite=true]
-        * @param boolean [Unicode=false]
-        */
+         * Create a file as a TextStream
+         * @param boolean [Overwrite=true]
+         * @param boolean [Unicode=false]
+         */
         CreateTextFile(FileName: string, Overwrite?: boolean, Unicode?: boolean): TextStream;
         
         /** Date folder was created */
@@ -359,9 +359,9 @@ declare namespace Scripting {
         readonly DateLastModified: VarDate;
         
         /**
-        * Delete this folder
-        * @param boolean [Force=false]
-        */
+         * Delete this folder
+         * @param boolean [Force=false]
+         */
         Delete(Force?: boolean): void;
         
         /** Get drive that contains folder */
@@ -454,9 +454,9 @@ declare namespace Scripting {
         WriteBlankLines(Lines: number): void;
         
         /**
-        * Write a string and an end of line to the stream
-        * @param string [Text='']
-        */
+         * Write a string and an end of line to the stream
+         * @param string [Text='']
+         */
         WriteLine(Text?: string): void;
     }
 
@@ -474,5 +474,4 @@ interface EnumeratorConstructor {
     new(col: Scripting.Drives): Scripting.Drive;
     new(col: Scripting.Files): Scripting.File;
     new(col: Scripting.Folders): Scripting.Folder;
-}
-
+}
\ No newline at end of file
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index 266902a683..564b7fbf04 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -169,58 +169,58 @@ declare namespace WIA {
     interface CommonDialog {
         
         /**
-        * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile object on success, otherwise Nothing
-        * @param WIA.WiaDeviceType [DeviceType=0]
-        * @param WIA.WiaImageIntent [Intent=0]
-        * @param WIA.WiaImageBias [Bias=131072]
-        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
-        * @param boolean [AlwaysSelectDevice=false]
-        * @param boolean [UseCommonUI=true]
-        * @param boolean [CancelError=false]
-        */
+         * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile object on success, otherwise Nothing
+         * @param WIA.WiaDeviceType [DeviceType=0]
+         * @param WIA.WiaImageIntent [Intent=0]
+         * @param WIA.WiaImageBias [Bias=131072]
+         * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+         * @param boolean [AlwaysSelectDevice=false]
+         * @param boolean [UseCommonUI=true]
+         * @param boolean [CancelError=false]
+         */
         ShowAcquireImage(DeviceType?: WiaDeviceType, Intent?: WiaImageIntent, Bias?: WiaImageBias, FormatID?: string, AlwaysSelectDevice?: boolean, UseCommonUI?: boolean, CancelError?: boolean): ImageFile;
         
         /** Launches the Windows Scanner and Camera Wizard and returns Nothing. Future versions may return a collection of ImageFile objects. */
         ShowAcquisitionWizard(Device: Device): any;
         
         /**
-        * Displays the properties dialog box for the specified Device
-        * @param boolean [CancelError=false]
-        */
+         * Displays the properties dialog box for the specified Device
+         * @param boolean [CancelError=false]
+         */
         ShowDeviceProperties(Device: Device, CancelError?: boolean): void;
         
         /**
-        * Displays the properties dialog box for the specified Item
-        * @param boolean [CancelError=false]
-        */
+         * Displays the properties dialog box for the specified Item
+         * @param boolean [CancelError=false]
+         */
         ShowItemProperties(Item: Item, CancelError?: boolean): void;
         
         /** Launches the Photo Printing Wizard with the absolute path of a specific file or Vector of absolute paths to files */
         ShowPhotoPrintingWizard(Files: any): void;
         
         /**
-        * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success, otherwise Nothing
-        * @param WIA.WiaDeviceType [DeviceType=0]
-        * @param boolean [AlwaysSelectDevice=false]
-        * @param boolean [CancelError=false]
-        */
+         * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success, otherwise Nothing
+         * @param WIA.WiaDeviceType [DeviceType=0]
+         * @param boolean [AlwaysSelectDevice=false]
+         * @param boolean [CancelError=false]
+         */
         ShowSelectDevice(DeviceType?: WiaDeviceType, AlwaysSelectDevice?: boolean, CancelError?: boolean): Device;
         
         /**
-        * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an Items collection on success, otherwise Nothing
-        * @param WIA.WiaImageIntent [Intent=0]
-        * @param WIA.WiaImageBias [Bias=131072]
-        * @param boolean [SingleSelect=true]
-        * @param boolean [UseCommonUI=true]
-        * @param boolean [CancelError=false]
-        */
+         * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an Items collection on success, otherwise Nothing
+         * @param WIA.WiaImageIntent [Intent=0]
+         * @param WIA.WiaImageBias [Bias=131072]
+         * @param boolean [SingleSelect=true]
+         * @param boolean [UseCommonUI=true]
+         * @param boolean [CancelError=false]
+         */
         ShowSelectItems(Device: Device, Intent?: WiaImageIntent, Bias?: WiaImageBias, SingleSelect?: boolean, UseCommonUI?: boolean, CancelError?: boolean): Items;
         
         /**
-        * Displays a progress dialog box while transferring the specified Item to the local machine. See Item.Transfer for additional information.
-        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
-        * @param boolean [CancelError=false]
-        */
+         * Displays a progress dialog box while transferring the specified Item to the local machine. See Item.Transfer for additional information.
+         * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+         * @param boolean [CancelError=false]
+         */
         ShowTransfer(Item: Item, FormatID?: string, CancelError?: boolean): any;
     }
 
@@ -337,27 +337,27 @@ declare namespace WIA {
         readonly DeviceInfos: DeviceInfos;
         
         /**
-        * Registers the specified EventID for the specified DeviceID. If DeviceID is "*" then OnEvent will be called whenever the event specified occurs for any device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
-        * @param string [DeviceID='*']
-        */
+         * Registers the specified EventID for the specified DeviceID. If DeviceID is "*" then OnEvent will be called whenever the event specified occurs for any device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
+         * @param string [DeviceID='*']
+         */
         RegisterEvent(EventID: string, DeviceID?: string): void;
         
         /**
-        * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full path name and the appropriate command-line arguments needed to invoke the application.
-        * @param string [DeviceID='*']
-        */
+         * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full path name and the appropriate command-line arguments needed to invoke the application.
+         * @param string [DeviceID='*']
+         */
         RegisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
         
         /**
-        * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called RegisterEvent.
-        * @param string [DeviceID='*']
-        */
+         * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called RegisterEvent.
+         * @param string [DeviceID='*']
+         */
         UnregisterEvent(EventID: string, DeviceID?: string): void;
         
         /**
-        * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the Command, Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
-        * @param string [DeviceID='*']
-        */
+         * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the Command, Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
+         * @param string [DeviceID='*']
+         */
         UnregisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
     }
 
@@ -404,9 +404,9 @@ declare namespace WIA {
     interface Filters {
         
         /**
-        * Appends/Inserts a new Filter of the specified FilterID into a Filter collection
-        * @param number [Index=0]
-        */
+         * Appends/Inserts a new Filter of the specified FilterID into a Filter collection
+         * @param number [Index=0]
+         */
         Add(FilterID: string, Index?: number): void;
         
         /** Returns the number of members in the collection */
@@ -522,9 +522,9 @@ declare namespace WIA {
         readonly Properties: Properties;
         
         /**
-        * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging device. Future versions may return a collection of ImageFile objects.
-        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
-        */
+         * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging device. Future versions may return a collection of ImageFile objects.
+         * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+         */
         Transfer(FormatID?: string): any;
         
         /** Returns the underlying IWiaItem interface for this Item object */
@@ -617,9 +617,9 @@ declare namespace WIA {
     interface Vector {
         
         /**
-        * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the Vector collection.
-        * @param number [Index=0]
-        */
+         * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the Vector collection.
+         * @param number [Index=0]
+         */
         Add(Value: any, Index?: number): void;
         
         /** Returns/Sets the Vector of Bytes as an array of bytes */
@@ -635,36 +635,36 @@ declare namespace WIA {
         Date: VarDate;
         
         /**
-        * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an ImageFile from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
-        * @param number [Width=0]
-        * @param number [Height=0]
-        */
+         * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an ImageFile from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
+         * @param number [Width=0]
+         * @param number [Height=0]
+         */
         ImageFile(Width?: number, Height?: number): ImageFile;
         
         /** Returns/Sets the specified item in the vector by position */
         Item(Index: number): any;
         
         /**
-        * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs must be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
-        * @param number [Width=0]
-        * @param number [Height=0]
-        */
+         * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs must be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
+         * @param number [Width=0]
+         * @param number [Height=0]
+         */
         Picture(Width?: number, Height?: number): any;
         
         /** Removes the designated element and returns it if successful */
         Remove(Index: number): any;
         
         /**
-        * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be stored as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
-        * @param boolean [Resizable=true]
-        * @param boolean [Unicode=true]
-        */
+         * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be stored as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
+         * @param boolean [Resizable=true]
+         * @param boolean [Unicode=true]
+         */
         SetFromString(Value: string, Resizable?: boolean, Unicode?: boolean): void;
         
         /**
-        * Returns a Vector of Bytes as a String
-        * @param boolean [Unicode=true]
-        */
+         * Returns a Vector of Bytes as a String
+         * @param boolean [Unicode=true]
+         */
         String(Unicode?: boolean): string;
     }
 
@@ -691,5 +691,4 @@ interface EnumeratorConstructor {
     new(col: WIA.Items): WIA.Item;
     new(col: WIA.Properties): WIA.Property;
     new(col: WIA.Vector): any;
-}
-
+}
\ No newline at end of file

From 3e4e990b4438fae359fc6cb3c1e242a33d031206 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 27 Jun 2017 02:55:43 +0200
Subject: [PATCH 064/287] dtslint fixes

---
 types/activex-adodb/index.d.ts     | 259 ++++++++++++++++-------------
 types/activex-scripting/index.d.ts |  97 ++++++-----
 types/activex-wia/index.d.ts       | 137 ++++++++-------
 3 files changed, 255 insertions(+), 238 deletions(-)

diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 8d27b7c706..f2b43ded9d 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,10 +1,9 @@
-// Type definitions for Microsoft ActiveX Data Objects
+// Type definitions for ADODB - 
 // Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
-// Definitions by: Zev Spitz <https://github.com/zspitz>
+// Defintions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ADODB {
-
     const enum ADCPROP_ASYNCTHREADPRIORITY_ENUM {
         adPriorityAboveNormal = 4,
         adPriorityBelowNormal = 2,
@@ -601,18 +600,18 @@ declare namespace ADODB {
         CommandText: string;
         CommandTimeout: number;
         CommandType: CommandTypeEnum;
-        
+
         /**
-        * @param string [Name='']
-        * @param ADODB.DataTypeEnum [Type=0]
-        * @param ADODB.ParameterDirectionEnum [Direction=1]
-        * @param number [Size=0]
-        */
+         * @param string [Name='']
+         * @param ADODB.DataTypeEnum [Type=0]
+         * @param ADODB.ParameterDirectionEnum [Direction=1]
+         * @param number [Size=0]
+         */
         CreateParameter(Name?: string, Type?: DataTypeEnum, Direction?: ParameterDirectionEnum, Size?: number, Value?: any): Parameter;
         Dialect: string;
-        
+
         /** @param number [Options=-1] */
-        Execute(RecordsAffected?: any, Parameters?: any[], Options?: number): Recordset;
+        Execute(RecordsAffected?: any, Parameters?: any, Options?: number): Recordset;
         Name: string;
         NamedParameters: boolean;
         readonly Parameters: Parameters;
@@ -633,18 +632,18 @@ declare namespace ADODB {
         CursorLocation: CursorLocationEnum;
         DefaultDatabase: string;
         readonly Errors: Errors;
-        
+
         /** @param number [Options=-1] */
         Execute(CommandText: string, RecordsAffected: any, Options?: number): Recordset;
         IsolationLevel: IsolationLevelEnum;
         Mode: ConnectModeEnum;
-        
+
         /**
-        * @param string [ConnectionString='']
-        * @param string [UserID='']
-        * @param string [Password='']
-        * @param number [Options=-1]
-        */
+         * @param string [ConnectionString='']
+         * @param string [UserID='']
+         * @param string [Password='']
+         * @param number [Options=-1]
+         */
         Open(ConnectionString?: string, UserID?: string, Password?: string, Options?: number): void;
         OpenSchema(Schema: SchemaEnum, Restrictions?: any, SchemaID?: any): Recordset;
         readonly Properties: Properties;
@@ -690,24 +689,23 @@ declare namespace ADODB {
     }
 
     interface Fields {
-        
         /**
-        * @param number [DefinedSize=0]
-        * @param ADODB.FieldAttributeEnum [Attrib=-1]
-        */
+         * @param number [DefinedSize=0]
+         * @param ADODB.FieldAttributeEnum [Attrib=-1]
+         */
         _Append(Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum): void;
-        
+
         /**
-        * @param number [DefinedSize=0]
-        * @param ADODB.FieldAttributeEnum [Attrib=-1]
-        */
+         * @param number [DefinedSize=0]
+         * @param ADODB.FieldAttributeEnum [Attrib=-1]
+         */
         Append(Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum, FieldValue?: any): void;
         CancelUpdate(): void;
         readonly Count: number;
         Delete(Index: any): void;
         Item(Index: any): Field;
         Refresh(): void;
-        
+
         /** @param ADODB.ResyncEnum [ResyncValues=2] */
         Resync(ResyncValues?: ResyncEnum): void;
         Update(): void;
@@ -751,43 +749,43 @@ declare namespace ADODB {
         ActiveConnection: any;
         Cancel(): void;
         Close(): void;
-        
+
         /**
-        * @param string [Source='']
-        * @param string [Destination='']
-        * @param string [UserName='']
-        * @param string [Password='']
-        * @param ADODB.CopyRecordOptionsEnum [Options=-1]
-        * @param boolean [Async=false]
-        */
+         * @param string [Source='']
+         * @param string [Destination='']
+         * @param string [UserName='']
+         * @param string [Password='']
+         * @param ADODB.CopyRecordOptionsEnum [Options=-1]
+         * @param boolean [Async=false]
+         */
         CopyRecord(Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: CopyRecordOptionsEnum, Async?: boolean): string;
-        
+
         /**
-        * @param string [Source='']
-        * @param boolean [Async=false]
-        */
+         * @param string [Source='']
+         * @param boolean [Async=false]
+         */
         DeleteRecord(Source?: string, Async?: boolean): void;
         readonly Fields: Fields;
         GetChildren(): Recordset;
         Mode: ConnectModeEnum;
-        
+
         /**
-        * @param string [Source='']
-        * @param string [Destination='']
-        * @param string [UserName='']
-        * @param string [Password='']
-        * @param ADODB.MoveRecordOptionsEnum [Options=-1]
-        * @param boolean [Async=false]
-        */
+         * @param string [Source='']
+         * @param string [Destination='']
+         * @param string [UserName='']
+         * @param string [Password='']
+         * @param ADODB.MoveRecordOptionsEnum [Options=-1]
+         * @param boolean [Async=false]
+         */
         MoveRecord(Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: MoveRecordOptionsEnum, Async?: boolean): string;
-        
+
         /**
-        * @param ADODB.ConnectModeEnum [Mode=0]
-        * @param ADODB.RecordCreateOptionsEnum [CreateOptions=-1]
-        * @param ADODB.RecordOpenOptionsEnum [Options=-1]
-        * @param string [UserName='']
-        * @param string [Password='']
-        */
+         * @param ADODB.ConnectModeEnum [Mode=0]
+         * @param ADODB.RecordCreateOptionsEnum [CreateOptions=-1]
+         * @param ADODB.RecordOpenOptionsEnum [Options=-1]
+         * @param string [UserName='']
+         * @param string [Password='']
+         */
         Open(Source: any, ActiveConnection: any, Mode?: ConnectModeEnum, CreateOptions?: RecordCreateOptionsEnum, Options?: RecordOpenOptionsEnum, UserName?: string, Password?: string): void;
         readonly ParentURL: string;
         readonly Properties: Properties;
@@ -798,14 +796,14 @@ declare namespace ADODB {
 
     interface Recordset {
         _xClone(): Recordset;
-        
+
         /** @param ADODB.AffectEnum [AffectRecords=3] */
         _xResync(AffectRecords?: AffectEnum): void;
-        
+
         /**
-        * @param string [FileName='']
-        * @param ADODB.PersistFormatEnum [PersistFormat=0]
-        */
+         * @param string [FileName='']
+         * @param ADODB.PersistFormatEnum [PersistFormat=0]
+         */
         _xSave(FileName?: string, PersistFormat?: PersistFormatEnum): void;
         AbsolutePage: PositionEnum;
         AbsolutePosition: PositionEnum;
@@ -816,11 +814,11 @@ declare namespace ADODB {
         Bookmark: any;
         CacheSize: number;
         Cancel(): void;
-        
+
         /** @param ADODB.AffectEnum [AffectRecords=3] */
         CancelBatch(AffectRecords?: AffectEnum): void;
         CancelUpdate(): void;
-        
+
         /** @param ADODB.LockTypeEnum [LockType=-1] */
         Clone(LockType?: LockTypeEnum): Recordset;
         Close(): void;
@@ -830,30 +828,30 @@ declare namespace ADODB {
         CursorType: CursorTypeEnum;
         DataMember: string;
         DataSource: any;
-        
+
         /** @param ADODB.AffectEnum [AffectRecords=1] */
         Delete(AffectRecords?: AffectEnum): void;
         readonly EditMode: EditModeEnum;
         readonly EOF: boolean;
         readonly Fields: Fields;
         Filter: any;
-        
+
         /**
-        * @param number [SkipRecords=0]
-        * @param ADODB.SearchDirectionEnum [SearchDirection=1]
-        */
+         * @param number [SkipRecords=0]
+         * @param ADODB.SearchDirectionEnum [SearchDirection=1]
+         */
         Find(Criteria: string, SkipRecords?: number, SearchDirection?: SearchDirectionEnum, Start?: any): void;
-        
+
         /** @param number [Rows=-1] */
         GetRows(Rows?: number, Start?: any, Fields?: any): any;
-        
+
         /**
-        * @param ADODB.StringFormatEnum [StringFormat=2]
-        * @param number [NumRows=-1]
-        * @param string [ColumnDelimeter='']
-        * @param string [RowDelimeter='']
-        * @param string [NullExpr='']
-        */
+         * @param ADODB.StringFormatEnum [StringFormat=2]
+         * @param number [NumRows=-1]
+         * @param string [ColumnDelimeter='']
+         * @param string [RowDelimeter='']
+         * @param string [NullExpr='']
+         */
         GetString(StringFormat?: StringFormatEnum, NumRows?: number, ColumnDelimeter?: string, RowDelimeter?: string, NullExpr?: string): string;
         Index: string;
         LockType: LockTypeEnum;
@@ -865,30 +863,30 @@ declare namespace ADODB {
         MoveNext(): void;
         MovePrevious(): void;
         NextRecordset(RecordsAffected?: any): Recordset;
-        
+
         /**
-        * @param ADODB.CursorTypeEnum [CursorType=-1]
-        * @param ADODB.LockTypeEnum [LockType=-1]
-        * @param number [Options=-1]
-        */
+         * @param ADODB.CursorTypeEnum [CursorType=-1]
+         * @param ADODB.LockTypeEnum [LockType=-1]
+         * @param number [Options=-1]
+         */
         Open(Source: any, ActiveConnection: any, CursorType?: CursorTypeEnum, LockType?: LockTypeEnum, Options?: number): void;
         readonly PageCount: number;
         PageSize: number;
         readonly Properties: Properties;
         readonly RecordCount: number;
-        
+
         /** @param number [Options=-1] */
         Requery(Options?: number): void;
-        
+
         /**
-        * @param ADODB.AffectEnum [AffectRecords=3]
-        * @param ADODB.ResyncEnum [ResyncValues=2]
-        */
+         * @param ADODB.AffectEnum [AffectRecords=3]
+         * @param ADODB.ResyncEnum [ResyncValues=2]
+         */
         Resync(AffectRecords?: AffectEnum, ResyncValues?: ResyncEnum): void;
-        
+
         /** @param ADODB.PersistFormatEnum [PersistFormat=0] */
         Save(Destination: any, PersistFormat?: PersistFormatEnum): void;
-        
+
         /** @param ADODB.SeekEnum [SeekOption=1] */
         Seek(KeyValues: any, SeekOption?: SeekEnum): void;
         Sort: string;
@@ -898,7 +896,7 @@ declare namespace ADODB {
         StayInSync: boolean;
         Supports(CursorOptions: CursorOptionEnum): boolean;
         Update(Fields?: any, Values?: any): void;
-        
+
         /** @param ADODB.AffectEnum [AffectRecords=3] */
         UpdateBatch(AffectRecords?: AffectEnum): void;
     }
@@ -907,7 +905,7 @@ declare namespace ADODB {
         Cancel(): void;
         Charset: string;
         Close(): void;
-        
+
         /** @param number [CharNumber=-1] */
         CopyTo(DestStream: Stream, CharNumber?: number): void;
         readonly EOS: boolean;
@@ -915,22 +913,22 @@ declare namespace ADODB {
         LineSeparator: LineSeparatorEnum;
         LoadFromFile(FileName: string): void;
         Mode: ConnectModeEnum;
-        
+
         /**
-        * @param ADODB.ConnectModeEnum [Mode=0]
-        * @param ADODB.StreamOpenOptionsEnum [Options=-1]
-        * @param string [UserName='']
-        * @param string [Password='']
-        */
+         * @param ADODB.ConnectModeEnum [Mode=0]
+         * @param ADODB.StreamOpenOptionsEnum [Options=-1]
+         * @param string [UserName='']
+         * @param string [Password='']
+         */
         Open(Source: any, Mode?: ConnectModeEnum, Options?: StreamOpenOptionsEnum, UserName?: string, Password?: string): void;
         Position: number;
-        
+
         /** @param number [NumBytes=-1] */
         Read(NumBytes?: number): any;
-        
+
         /** @param number [NumChars=-1] */
         ReadText(NumChars?: number): string;
-        
+
         /** @param ADODB.SaveOptionsEnum [Options=1] */
         SaveToFile(FileName: string, Options?: SaveOptionsEnum): void;
         SetEOS(): void;
@@ -939,7 +937,7 @@ declare namespace ADODB {
         readonly State: ObjectStateEnum;
         Type: StreamTypeEnum;
         Write(Buffer: any): void;
-        
+
         /** @param ADODB.StreamWriteEnum [Options=0] */
         WriteText(Data: string, Options?: StreamWriteEnum): void;
     }
@@ -947,26 +945,48 @@ declare namespace ADODB {
 }
 
 interface ActiveXObject {
-    on(obj: ADODB.Connection, eventName: 'BeginTransComplete', eventArgs: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {TransactionLevel: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'CommitTransComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'ConnectComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'Disconnect', eventArgs: ['adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'ExecuteComplete', eventArgs: ['RecordsAffected', 'pError', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'], handler: (this: ADODB.Connection, parameter: {RecordsAffected: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'InfoMessage', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'RollbackTransComplete', eventArgs: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'WillConnect', eventArgs: ['ConnectionString', 'UserID', 'Password', 'Options', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {ConnectionString: string, UserID: string, Password: string, Options: number, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, eventName: 'WillExecute', eventArgs: ['Source', 'CursorType', 'LockType', 'Options', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'], handler: (this: ADODB.Connection, parameter: {Source: string, CursorType: ADODB.CursorTypeEnum, LockType: ADODB.LockTypeEnum, Options: number, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'EndOfRecordset', eventArgs: ['fMoreData', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {fMoreData: boolean, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'FetchComplete', eventArgs: ['pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'FetchProgress', eventArgs: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {Progress: number, MaxProgress: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'FieldChangeComplete', eventArgs: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number, Fields: any, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'MoveComplete', eventArgs: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'RecordChangeComplete', eventArgs: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, cRecords: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'RecordsetChangeComplete', eventArgs: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'WillChangeField', eventArgs: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number, Fields: any, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'WillChangeRecord', eventArgs: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, cRecords: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'WillChangeRecordset', eventArgs: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, eventName: 'WillMove', eventArgs: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Connection, event: 'BeginTransComplete', argNames: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {
+        TransactionLevel: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'CommitTransComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'ConnectComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'Disconnect', argNames: ['adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum,
+         pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'ExecuteComplete', argNames: ['RecordsAffected', 'pError', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'],
+         handler: (this: ADODB.Connection, parameter: {RecordsAffected: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command,
+         pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'InfoMessage', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'RollbackTransComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'WillConnect', argNames: ['ConnectionString', 'UserID', 'Password', 'Options', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection,
+         parameter: {ConnectionString: string, UserID: string, Password: string, Options: number, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'WillExecute', argNames: ['Source', 'CursorType', 'LockType', 'Options', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'],
+         handler: (this: ADODB.Connection, parameter: {Source: string, CursorType: ADODB.CursorTypeEnum, LockType: ADODB.LockTypeEnum, Options: number,
+         adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Recordset, event: 'EndOfRecordset', argNames: ['fMoreData', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {fMoreData: boolean,
+         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FetchComplete', argNames: ['pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {pError: ADODB.Error,
+         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FetchProgress', argNames: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {Progress: number,
+         MaxProgress: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FieldChangeComplete', argNames: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        cFields: number, Fields: any, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'MoveComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'RecordChangeComplete', argNames: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, cRecords: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'RecordsetChangeComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeField', argNames: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number,
+         Fields: any, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeRecord', argNames: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, cRecords: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeRecordset', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+        adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillMove', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum,
+         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
     set(obj: ADODB.Recordset, propertyName: 'Collect', parameterTypes: [any], newValue: any): void;
     new(progid: 'ADODB.Command'): ADODB.Command;
     new(progid: 'ADODB.Connection'): ADODB.Connection;
@@ -981,5 +1001,4 @@ interface EnumeratorConstructor {
     new(col: ADODB.Fields): ADODB.Field;
     new(col: ADODB.Parameters): ADODB.Parameter;
     new(col: ADODB.Properties): ADODB.Property;
-}
-
+}
\ No newline at end of file
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index 7911113175..1dd659fc7a 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -156,9 +156,9 @@ declare namespace Scripting {
         Attributes: FileAttribute;
         
         /**
-        * Copy this file
-        * @param boolean [OverWriteFiles=true]
-        */
+         * Copy this file
+         * @param boolean [OverWriteFiles=true]
+         */
         Copy(Destination: string, OverWriteFiles?: boolean): void;
         
         /** Date file was created */
@@ -171,9 +171,9 @@ declare namespace Scripting {
         readonly DateLastModified: VarDate;
         
         /**
-        * Delete this file
-        * @param boolean [Force=false]
-        */
+         * Delete this file
+         * @param boolean [Force=false]
+         */
         Delete(Force?: boolean): void;
         
         /** Get drive that contains file */
@@ -186,10 +186,10 @@ declare namespace Scripting {
         Name: string;
         
         /**
-        * Open a file as a TextStream
-        * @param Scripting.IOMode [IOMode=1]
-        * @param Scripting.Tristate [Format=0]
-        */
+         * Open a file as a TextStream
+         * @param Scripting.IOMode [IOMode=1]
+         * @param Scripting.Tristate [Format=0]
+         */
         OpenAsTextStream(IOMode?: IOMode, Format?: Tristate): TextStream;
         
         /** Get folder that contains file */
@@ -228,37 +228,37 @@ declare namespace Scripting {
         BuildPath(Path: string, Name: string): string;
         
         /**
-        * Copy a file
-        * @param boolean [OverWriteFiles=true]
-        */
+         * Copy a file
+         * @param boolean [OverWriteFiles=true]
+         */
         CopyFile(Source: string, Destination: string, OverWriteFiles?: boolean): void;
         
         /**
-        * Copy a folder
-        * @param boolean [OverWriteFiles=true]
-        */
+         * Copy a folder
+         * @param boolean [OverWriteFiles=true]
+         */
         CopyFolder(Source: string, Destination: string, OverWriteFiles?: boolean): void;
         
         /** Create a folder */
         CreateFolder(Path: string): Folder;
         
         /**
-        * Create a file as a TextStream
-        * @param boolean [Overwrite=true]
-        * @param boolean [Unicode=false]
-        */
+         * Create a file as a TextStream
+         * @param boolean [Overwrite=true]
+         * @param boolean [Unicode=false]
+         */
         CreateTextFile(FileName: string, Overwrite?: boolean, Unicode?: boolean): TextStream;
         
         /**
-        * Delete a file
-        * @param boolean [Force=false]
-        */
+         * Delete a file
+         * @param boolean [Force=false]
+         */
         DeleteFile(FileSpec: string, Force?: boolean): void;
         
         /**
-        * Delete a folder
-        * @param boolean [Force=false]
-        */
+         * Delete a folder
+         * @param boolean [Force=false]
+         */
         DeleteFolder(FolderSpec: string, Force?: boolean): void;
         
         /** Check if a drive or a share exists */
@@ -307,9 +307,9 @@ declare namespace Scripting {
         GetSpecialFolder(SpecialFolder: SpecialFolderConst): Folder;
         
         /**
-        * Retrieve the standard input, output or error stream
-        * @param boolean [Unicode=false]
-        */
+         * Retrieve the standard input, output or error stream
+         * @param boolean [Unicode=false]
+         */
         GetStandardStream(StandardStreamType: StandardStreamTypes, Unicode?: boolean): TextStream;
         
         /** Generate name that can be used to name a temporary file */
@@ -322,11 +322,11 @@ declare namespace Scripting {
         MoveFolder(Source: string, Destination: string): void;
         
         /**
-        * Open a file as a TextStream
-        * @param Scripting.IOMode [IOMode=1]
-        * @param boolean [Create=false]
-        * @param Scripting.Tristate [Format=0]
-        */
+         * Open a file as a TextStream
+         * @param Scripting.IOMode [IOMode=1]
+         * @param boolean [Create=false]
+         * @param Scripting.Tristate [Format=0]
+         */
         OpenTextFile(FileName: string, IOMode?: IOMode, Create?: boolean, Format?: Tristate): TextStream;
     }
 
@@ -337,16 +337,16 @@ declare namespace Scripting {
         Attributes: FileAttribute;
         
         /**
-        * Copy this folder
-        * @param boolean [OverWriteFiles=true]
-        */
+         * Copy this folder
+         * @param boolean [OverWriteFiles=true]
+         */
         Copy(Destination: string, OverWriteFiles?: boolean): void;
         
         /**
-        * Create a file as a TextStream
-        * @param boolean [Overwrite=true]
-        * @param boolean [Unicode=false]
-        */
+         * Create a file as a TextStream
+         * @param boolean [Overwrite=true]
+         * @param boolean [Unicode=false]
+         */
         CreateTextFile(FileName: string, Overwrite?: boolean, Unicode?: boolean): TextStream;
         
         /** Date folder was created */
@@ -359,9 +359,9 @@ declare namespace Scripting {
         readonly DateLastModified: VarDate;
         
         /**
-        * Delete this folder
-        * @param boolean [Force=false]
-        */
+         * Delete this folder
+         * @param boolean [Force=false]
+         */
         Delete(Force?: boolean): void;
         
         /** Get drive that contains folder */
@@ -454,9 +454,9 @@ declare namespace Scripting {
         WriteBlankLines(Lines: number): void;
         
         /**
-        * Write a string and an end of line to the stream
-        * @param string [Text='']
-        */
+         * Write a string and an end of line to the stream
+         * @param string [Text='']
+         */
         WriteLine(Text?: string): void;
     }
 
@@ -474,5 +474,4 @@ interface EnumeratorConstructor {
     new(col: Scripting.Drives): Scripting.Drive;
     new(col: Scripting.Files): Scripting.File;
     new(col: Scripting.Folders): Scripting.Folder;
-}
-
+}
\ No newline at end of file
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index 266902a683..564b7fbf04 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -169,58 +169,58 @@ declare namespace WIA {
     interface CommonDialog {
         
         /**
-        * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile object on success, otherwise Nothing
-        * @param WIA.WiaDeviceType [DeviceType=0]
-        * @param WIA.WiaImageIntent [Intent=0]
-        * @param WIA.WiaImageBias [Bias=131072]
-        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
-        * @param boolean [AlwaysSelectDevice=false]
-        * @param boolean [UseCommonUI=true]
-        * @param boolean [CancelError=false]
-        */
+         * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile object on success, otherwise Nothing
+         * @param WIA.WiaDeviceType [DeviceType=0]
+         * @param WIA.WiaImageIntent [Intent=0]
+         * @param WIA.WiaImageBias [Bias=131072]
+         * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+         * @param boolean [AlwaysSelectDevice=false]
+         * @param boolean [UseCommonUI=true]
+         * @param boolean [CancelError=false]
+         */
         ShowAcquireImage(DeviceType?: WiaDeviceType, Intent?: WiaImageIntent, Bias?: WiaImageBias, FormatID?: string, AlwaysSelectDevice?: boolean, UseCommonUI?: boolean, CancelError?: boolean): ImageFile;
         
         /** Launches the Windows Scanner and Camera Wizard and returns Nothing. Future versions may return a collection of ImageFile objects. */
         ShowAcquisitionWizard(Device: Device): any;
         
         /**
-        * Displays the properties dialog box for the specified Device
-        * @param boolean [CancelError=false]
-        */
+         * Displays the properties dialog box for the specified Device
+         * @param boolean [CancelError=false]
+         */
         ShowDeviceProperties(Device: Device, CancelError?: boolean): void;
         
         /**
-        * Displays the properties dialog box for the specified Item
-        * @param boolean [CancelError=false]
-        */
+         * Displays the properties dialog box for the specified Item
+         * @param boolean [CancelError=false]
+         */
         ShowItemProperties(Item: Item, CancelError?: boolean): void;
         
         /** Launches the Photo Printing Wizard with the absolute path of a specific file or Vector of absolute paths to files */
         ShowPhotoPrintingWizard(Files: any): void;
         
         /**
-        * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success, otherwise Nothing
-        * @param WIA.WiaDeviceType [DeviceType=0]
-        * @param boolean [AlwaysSelectDevice=false]
-        * @param boolean [CancelError=false]
-        */
+         * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success, otherwise Nothing
+         * @param WIA.WiaDeviceType [DeviceType=0]
+         * @param boolean [AlwaysSelectDevice=false]
+         * @param boolean [CancelError=false]
+         */
         ShowSelectDevice(DeviceType?: WiaDeviceType, AlwaysSelectDevice?: boolean, CancelError?: boolean): Device;
         
         /**
-        * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an Items collection on success, otherwise Nothing
-        * @param WIA.WiaImageIntent [Intent=0]
-        * @param WIA.WiaImageBias [Bias=131072]
-        * @param boolean [SingleSelect=true]
-        * @param boolean [UseCommonUI=true]
-        * @param boolean [CancelError=false]
-        */
+         * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an Items collection on success, otherwise Nothing
+         * @param WIA.WiaImageIntent [Intent=0]
+         * @param WIA.WiaImageBias [Bias=131072]
+         * @param boolean [SingleSelect=true]
+         * @param boolean [UseCommonUI=true]
+         * @param boolean [CancelError=false]
+         */
         ShowSelectItems(Device: Device, Intent?: WiaImageIntent, Bias?: WiaImageBias, SingleSelect?: boolean, UseCommonUI?: boolean, CancelError?: boolean): Items;
         
         /**
-        * Displays a progress dialog box while transferring the specified Item to the local machine. See Item.Transfer for additional information.
-        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
-        * @param boolean [CancelError=false]
-        */
+         * Displays a progress dialog box while transferring the specified Item to the local machine. See Item.Transfer for additional information.
+         * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+         * @param boolean [CancelError=false]
+         */
         ShowTransfer(Item: Item, FormatID?: string, CancelError?: boolean): any;
     }
 
@@ -337,27 +337,27 @@ declare namespace WIA {
         readonly DeviceInfos: DeviceInfos;
         
         /**
-        * Registers the specified EventID for the specified DeviceID. If DeviceID is "*" then OnEvent will be called whenever the event specified occurs for any device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
-        * @param string [DeviceID='*']
-        */
+         * Registers the specified EventID for the specified DeviceID. If DeviceID is "*" then OnEvent will be called whenever the event specified occurs for any device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
+         * @param string [DeviceID='*']
+         */
         RegisterEvent(EventID: string, DeviceID?: string): void;
         
         /**
-        * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full path name and the appropriate command-line arguments needed to invoke the application.
-        * @param string [DeviceID='*']
-        */
+         * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full path name and the appropriate command-line arguments needed to invoke the application.
+         * @param string [DeviceID='*']
+         */
         RegisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
         
         /**
-        * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called RegisterEvent.
-        * @param string [DeviceID='*']
-        */
+         * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called RegisterEvent.
+         * @param string [DeviceID='*']
+         */
         UnregisterEvent(EventID: string, DeviceID?: string): void;
         
         /**
-        * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the Command, Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
-        * @param string [DeviceID='*']
-        */
+         * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the Command, Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
+         * @param string [DeviceID='*']
+         */
         UnregisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
     }
 
@@ -404,9 +404,9 @@ declare namespace WIA {
     interface Filters {
         
         /**
-        * Appends/Inserts a new Filter of the specified FilterID into a Filter collection
-        * @param number [Index=0]
-        */
+         * Appends/Inserts a new Filter of the specified FilterID into a Filter collection
+         * @param number [Index=0]
+         */
         Add(FilterID: string, Index?: number): void;
         
         /** Returns the number of members in the collection */
@@ -522,9 +522,9 @@ declare namespace WIA {
         readonly Properties: Properties;
         
         /**
-        * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging device. Future versions may return a collection of ImageFile objects.
-        * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
-        */
+         * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging device. Future versions may return a collection of ImageFile objects.
+         * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
+         */
         Transfer(FormatID?: string): any;
         
         /** Returns the underlying IWiaItem interface for this Item object */
@@ -617,9 +617,9 @@ declare namespace WIA {
     interface Vector {
         
         /**
-        * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the Vector collection.
-        * @param number [Index=0]
-        */
+         * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the Vector collection.
+         * @param number [Index=0]
+         */
         Add(Value: any, Index?: number): void;
         
         /** Returns/Sets the Vector of Bytes as an array of bytes */
@@ -635,36 +635,36 @@ declare namespace WIA {
         Date: VarDate;
         
         /**
-        * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an ImageFile from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
-        * @param number [Width=0]
-        * @param number [Height=0]
-        */
+         * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an ImageFile from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
+         * @param number [Width=0]
+         * @param number [Height=0]
+         */
         ImageFile(Width?: number, Height?: number): ImageFile;
         
         /** Returns/Sets the specified item in the vector by position */
         Item(Index: number): any;
         
         /**
-        * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs must be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
-        * @param number [Width=0]
-        * @param number [Height=0]
-        */
+         * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs must be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
+         * @param number [Width=0]
+         * @param number [Height=0]
+         */
         Picture(Width?: number, Height?: number): any;
         
         /** Removes the designated element and returns it if successful */
         Remove(Index: number): any;
         
         /**
-        * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be stored as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
-        * @param boolean [Resizable=true]
-        * @param boolean [Unicode=true]
-        */
+         * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be stored as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
+         * @param boolean [Resizable=true]
+         * @param boolean [Unicode=true]
+         */
         SetFromString(Value: string, Resizable?: boolean, Unicode?: boolean): void;
         
         /**
-        * Returns a Vector of Bytes as a String
-        * @param boolean [Unicode=true]
-        */
+         * Returns a Vector of Bytes as a String
+         * @param boolean [Unicode=true]
+         */
         String(Unicode?: boolean): string;
     }
 
@@ -691,5 +691,4 @@ interface EnumeratorConstructor {
     new(col: WIA.Items): WIA.Item;
     new(col: WIA.Properties): WIA.Property;
     new(col: WIA.Vector): any;
-}
-
+}
\ No newline at end of file

From ac5f5de41c94b85a9e7cdcee56a6ccbbe13a8ef2 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 27 Jun 2017 03:02:19 +0200
Subject: [PATCH 065/287] Reverted last commit

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

diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index f2b43ded9d..28e7d7f8ff 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,8 +1,3 @@
-// Type definitions for ADODB - 
-// Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
-// Defintions by: Zev Spitz <https://github.com/zspitz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 declare namespace ADODB {
     const enum ADCPROP_ASYNCTHREADPRIORITY_ENUM {
         adPriorityAboveNormal = 4,

From 4773e99bd40d0fdca7c77c6f4dc19315dfe81ed6 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 27 Jun 2017 03:03:03 +0200
Subject: [PATCH 066/287] Restored headers

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

diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 28e7d7f8ff..f2b43ded9d 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,3 +1,8 @@
+// Type definitions for ADODB - 
+// Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
+// Defintions by: Zev Spitz <https://github.com/zspitz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 declare namespace ADODB {
     const enum ADCPROP_ASYNCTHREADPRIORITY_ENUM {
         adPriorityAboveNormal = 4,

From 05605cbc651d338fee89521e321b925026652068 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 27 Jun 2017 03:06:33 +0200
Subject: [PATCH 067/287] Fixed defintions (again :()

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

diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index f2b43ded9d..5e89dcd55c 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for ADODB - 
 // Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
-// Defintions by: Zev Spitz <https://github.com/zspitz>
+// Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace ADODB {

From e67253bb487b271222774bb272ae17648734ccf0 Mon Sep 17 00:00:00 2001
From: clarenceh <ho.clarence@gmail.com>
Date: Tue, 27 Jun 2017 15:45:53 +0800
Subject: [PATCH 068/287] Updated Table interface type definition

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

diff --git a/types/massive/index.d.ts b/types/massive/index.d.ts
index ccf6469d91..8d6c251b07 100644
--- a/types/massive/index.d.ts
+++ b/types/massive/index.d.ts
@@ -50,9 +50,12 @@ declare namespace massive {
     count(criteria: object): Promise<string>;
     where(query: string, params: any[] | object): Promise<T[]>;
     search(criteria: SearchCriteria, queryOptions?: QueryOptions): Promise<any>;
-    save(data: object | object[]): Promise<T> | Promise<T[]>;
-    insert(data: object | object[]): Promise<T> | Promise<T[]>;
-    update(dataOrCriteria: object | object[], changesMap?: object): Promise<T> | Promise<T[]>;
+    save(data: object): Promise<T>;
+    save(data: object[]): Promise<T[]>;
+    insert(data: object): Promise<T>;
+    insert(data: object[]): Promise<T[]>;
+    update(dataOrCriteria: object, changesMap?: object): Promise<T>;
+    update(dataOrCriteria: object[], changesMap?: object): Promise<T[]>;
     destroy(criteria: object): Promise<T[]>;
   }
 

From 4b999a376fc72577d9a3635911f7404b2343fb09 Mon Sep 17 00:00:00 2001
From: rzymek <rzymek@gmail.com>
Date: Mon, 26 Jun 2017 18:46:48 +0200
Subject: [PATCH 069/287] lodash - Add _.toFinite

---
 types/lodash/index.d.ts          | 42 ++++++++++++++++++++++++++++++++
 types/lodash/lodash-tests.ts     | 25 ++++++++++++++++++-
 types/lodash/toFinite/index.d.ts |  2 ++
 types/lodash/tsconfig.json       |  1 +
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 types/lodash/toFinite/index.d.ts

diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index 6326773899..07988b3acd 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -12941,6 +12941,48 @@ declare namespace _ {
         toPlainObject<TResult extends {}>(): LoDashImplicitObjectWrapper<TResult>;
     }
 
+    //_.toFinite
+    interface LoDashStatic {
+        /**
+         * Converts `value` to a finite number.
+         *
+         * @static
+         * @memberOf _
+         * @since 4.12.0
+         * @category Lang
+         * @param {*} value The value to convert.
+         * @returns {number} Returns the converted number.
+         * @example
+         *
+         * _.toFinite(3.2);
+         * // => 3.2
+         *
+         * _.toFinite(Number.MIN_VALUE);
+         * // => 5e-324
+         *
+         * _.toFinite(Infinity);
+         * // => 1.7976931348623157e+308
+         *
+         * _.toFinite('3.2');
+         * // => 3.2
+         */
+        toFinite(value: any): number;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toFinite
+         */
+        toFinite(): LoDashImplicitWrapper<number>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.toFinite
+         */
+        toFinite(): LoDashExplicitWrapper<number>;
+    }
+
     //_.toInteger
     interface LoDashStatic {
         /**
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index b260df8ee5..bfa3e0d17c 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -7657,13 +7657,36 @@ namespace TestToPlainObject {
     }
 }
 
+// _.toFinite
+namespace TestToFinite {
+   {
+       let result: number;
+       result = _.toFinite(true);
+       result = _.toFinite(1);
+       result = _.toFinite('3.2');
+       result = _.toFinite([]);
+       result = _.toFinite({});
+   }
+
+   {
+       let result: _.LoDashImplicitWrapper<number>;
+
+       result = _(true).toFinite();
+       result = _(1).toFinite();
+       result = _('3.2').toFinite();
+       result = _([1]).toFinite();
+       result = _<string>([]).toFinite();
+       result = _({}).toFinite();
+   }
+}
+
 // _.toInteger
 namespace TestToInteger {
    {
        let result: number;
        result = _.toInteger(true);
        result = _.toInteger(1);
-       result = _.toInteger('a');
+       result = _.toInteger('3.2');
        result = _.toInteger([]);
        result = _.toInteger({});
    }
diff --git a/types/lodash/toFinite/index.d.ts b/types/lodash/toFinite/index.d.ts
new file mode 100644
index 0000000000..f0317af649
--- /dev/null
+++ b/types/lodash/toFinite/index.d.ts
@@ -0,0 +1,2 @@
+import { toFinite } from "../index";
+export = toFinite;
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index 419b6142b1..b740d6a4c2 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -247,6 +247,7 @@
         "thru/index.d.ts",
         "times/index.d.ts",
         "toArray/index.d.ts",
+        "toFinite/index.d.ts",
         "toInteger/index.d.ts",
         "toLength/index.d.ts",
         "toLower/index.d.ts",

From bcfc7d093411d13508ed5d770e4fc93aaa8176ec Mon Sep 17 00:00:00 2001
From: Alen <alen@wookiwi.local>
Date: Tue, 27 Jun 2017 17:06:15 +0800
Subject: [PATCH 070/287] change interface of i18next as v8.4.2

---
 types/i18next/i18next-tests.ts | 25 +++++++++----
 types/i18next/index.d.ts       | 66 ++++++++++++++++++----------------
 2 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/types/i18next/i18next-tests.ts b/types/i18next/i18next-tests.ts
index a96901cbb7..cdf30bb9c1 100644
--- a/types/i18next/i18next-tests.ts
+++ b/types/i18next/i18next-tests.ts
@@ -6,13 +6,14 @@ i18n.init({
         en: {
             translation: {
                 helloWorld: 'Hello, world!',
-                helloWorldInterpolated: 'Hello, {{name}}!'
+                helloWorldInterpolated: 'Hello, {{name}}!',
+                uppercaseFormatted: '{{text^uppercase}} just uppercased',
             }
         },
         ru: {
             translation: {
                 helloWorld: 'Привет, мир!',
-                helloWorldInterpolated: 'Привет, {{name}}!'
+                helloWorldInterpolated: 'Привет, {{name}}!',
             }
         }
     },
@@ -31,23 +32,29 @@ i18n.init({
     contextSeparator: '_',
     saveMissing: true,
     saveMissingTo: 'all',
-    missingKeyHandler: (lng:string, ns:string, key:string, fallbackValue:string) => {
+    missingKeyHandler: (lng: string, ns: string, key: string, fallbackValue: string) => {
         console.log('Lng: ' + lng + ', ns: ' + ns + ', key' + key + ', fallbackValue: ' + fallbackValue);
     },
-    parseMissingKeyHandler: (key:string) => {
+    parseMissingKeyHandler: (key: string) => {
         console.log(key);
     },
     appendNamespaceToMissingKey: true,
     returnNull: false,
     returnEmptyString: false,
     returnObjects: false,
-    returnedObjectHandler: (key:string, value:string, options:any) => {
+    returnedObjectHandler: (key: string, value: string, options: any) => {
     },
     joinArrays: '\n',
-    overloadTranslationOptionHandler: (args:any[]) => {
+    overloadTranslationOptionHandler: (args: any[]) => {
         return <i18n.TranslationOptions>{}
     },
-    interpolation: <i18n.InterpolationOptions>{},
+    interpolation: {
+        format: function(value, format, lng) {
+            if (format === 'uppercase') return value.toUpperCase();
+            return value;
+        },
+        formatSeparator: '^',
+    },
     detection: null,
     backend: null,
     cache: null,
@@ -77,6 +84,10 @@ i18n.t('helloWorldInterpolated', <i18n.TranslationOptions> {
     name: "world"
 });
 
+i18n.t('uppercaseFormatted', <i18n.TranslationOptions> {
+    text: 'can you hear me',
+});
+
 i18n.t('helloSingleFallbackLng', <i18n.TranslationOptions> {
     fallbackLng: 'en'
 });
diff --git a/types/i18next/index.d.ts b/types/i18next/index.d.ts
index 1cacdeb7c3..8ea39a6352 100644
--- a/types/i18next/index.d.ts
+++ b/types/i18next/index.d.ts
@@ -1,11 +1,10 @@
-// Type definitions for i18next v2.3.5
+// Type definitions for i18next v8.4.2
 // Project: http://i18next.com
 // Definitions by: Michael Ledin <https://github.com/mxl>, Budi Irawan <https://github.com/deerawan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Sources: https://github.com/i18next/i18next/
 
-
 declare namespace i18n {
     interface ResourceStore {
         [language: string]: ResourceStoreLanguage;
@@ -25,7 +24,12 @@ declare namespace i18n {
 
     type FallbackLng = string | string[] | FallbackLngObjList;
 
+    type FormatFunction = (value: any, format: string, lng: string) => string;
+
     interface InterpolationOptions {
+        format?: FormatFunction;
+        formatSeparator?: string;
+        escape?: (str: string) => string;
         escapeValue?: boolean;
         prefix?: string;
         suffix?: string;
@@ -99,40 +103,28 @@ declare namespace i18n {
     }
 
     type TranslationFunction = (key: string, options?: TranslationOptions) => string;
+    type LoadCallback = (error: any, t: TranslationFunction) => void;
 
     interface I18n {
-        //constructor(options?: Options, callback?: (err: any, t: TranslationFunction) => void);
-
-        init(options?: Options&ReactOptions, callback?: (err: any, t: TranslationFunction) => void): I18n;
-
-        loadResources(callback?: (err: any) => void): void;
-
-        language: string;
-
-        languages: string[];
-
+        // api
+        init(options?: Options & ReactOptions, callback?: LoadCallback): I18n;
         use(module: any): I18n;
-
-        changeLanguage(lng: string, callback?: (err: any, t: TranslationFunction) => void): void;
-
-        getFixedT(lng?: string, ns?: string | string[]): TranslationFunction;
-
-        t(key: string, options?: TranslationOptions): string | any | Array<any>;
-
+        t(key: string, options?: TranslationOptions): string | any | any[];
         exists(key: string, options?: TranslationOptions): boolean;
-
+        getFixedT(lng?: string, ns?: string | string[]): TranslationFunction;
+        changeLanguage(lng: string, callback?: LoadCallback): void;
+        language: string;
+        languages: string[];
+        loadNamespaces(ns: string[], callback?: LoadCallback): void;
+        loadLanguages(lngs: string[], callback?: LoadCallback): void;
+        reloadResources(lng?: string[], ns?: string[]): void;
         setDefaultNamespace(ns: string): void;
-
-        loadNamespaces(ns: string[], callback?: () => void): void;
-
-        loadLanguages(lngs: string[], callback?: () => void): void;
-
         dir(lng?: string): string;
-
-        createInstance(options?: Options, callback?: (err: any, t: TranslationFunction) => void): I18n;
-
-        cloneInstance(options?: Options, callback?: (err: any, t: TranslationFunction) => void): I18n;
-
+        format: FormatFunction;  // introduced in v8.4.0;
+        // instance creation
+        createInstance(options?: Options, callback?: LoadCallback): I18n;
+        cloneInstance(options?: Options, callback?: LoadCallback): I18n;
+        // events
         on(event: string, listener: () => void): void;
         on(initialized: 'initialized', listener: (options: i18n.Options) => void): void;
         on(loaded: 'loaded', listener: (loaded: any) => void): void;
@@ -141,8 +133,20 @@ declare namespace i18n {
         on(added: 'added', listener: (lng: string, ns: string) => void): void;
         on(removed: 'removed', listener: (lng: string, ns: string) => void): void;
         on(languageChanged: 'languageChanged', listener: (lng: string) => void): void;
-
         off(event: string, listener: () => void): void;
+        // resource handling
+        getResource(lng: string, ns: string, key: string, options?: {
+            keySeparator?: string,
+        }): ResourceStore;
+        addResource(lng: string, ns: string, key: string, value: string, options?: {
+            keySeparator?: string,
+            silent?: boolean,
+        }): void;
+        addResources(lng: string, ns: string, resources: ResourceStore): void;
+        addResourceBundle(lng: string, ns: string, resources: ResourceStore, deep: boolean, overwrite: boolean): void;
+        hasResourceBundle(lng: string, ns: string): boolean;
+        getResourceBundle(lng: string, ns: string): ResourceStore;
+        removeResourceBundle(lng: string, ns: string): void;
 
         options: Options;
     }

From 60b8c55092d17e8988f7a475e700b489c1106109 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Tue, 27 Jun 2017 11:24:15 +0200
Subject: [PATCH 071/287] Added react-tag-input

---
 types/react-tag-input/index.d.ts    | 26 ++++++++++++++++++++++++++
 types/react-tag-input/tsconfig.json | 22 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 types/react-tag-input/index.d.ts
 create mode 100644 types/react-tag-input/tsconfig.json

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
new file mode 100644
index 0000000000..fe7fcd28a8
--- /dev/null
+++ b/types/react-tag-input/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for React-Tags (react-tag-input) 4.7.2
+// Project: https://github.com/prakhar1989/react-tags
+// NPM: https://www.npmjs.com/package/react-tag-input
+// Definitions by: Ogglas <https://stackoverflow.com/users/3850405/ogglas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export interface ReactTagsProps {
+    tags?: TagItem[];
+    suggestions?: string[];
+    handleDelete: ((i: number) => void);
+    handleAddition: ((tag: string) => void);
+    handleDrag?: ((tag: TagItem, currPos: number, newPos: number) => void);
+    placeholder?: string;
+}
+
+export interface TagItem {
+    id: number;
+    text: string;
+}
+
+export class WithContext extends React.Component<ReactTagsProps, {}> { }
+
+export default WithContext;
diff --git a/types/react-tag-input/tsconfig.json b/types/react-tag-input/tsconfig.json
new file mode 100644
index 0000000000..1401eeeedb
--- /dev/null
+++ b/types/react-tag-input/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file

From 1aba4882b592988fb751c4e812353c1c109c3175 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Tue, 27 Jun 2017 11:31:57 +0200
Subject: [PATCH 072/287] Updates

---
 types/react-tag-input/index.d.ts               |  2 +-
 types/react-tag-input/react-tag-input-tests.ts |  0
 types/react-tag-input/tsconfig.json            | 16 ++++++++--------
 types/react-tag-input/tslint.json              |  1 +
 4 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 types/react-tag-input/react-tag-input-tests.ts
 create mode 100644 types/react-tag-input/tslint.json

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index fe7fcd28a8..e304f19e77 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -23,4 +23,4 @@ export interface TagItem {
 
 export class WithContext extends React.Component<ReactTagsProps, {}> { }
 
-export default WithContext;
+export default WithContext;
\ No newline at end of file
diff --git a/types/react-tag-input/react-tag-input-tests.ts b/types/react-tag-input/react-tag-input-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/react-tag-input/tsconfig.json b/types/react-tag-input/tsconfig.json
index 1401eeeedb..54836a10b5 100644
--- a/types/react-tag-input/tsconfig.json
+++ b/types/react-tag-input/tsconfig.json
@@ -1,16 +1,12 @@
 {
-    "files": [
-        "index.d.ts"
-    ],
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -18,5 +14,9 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
-    }
-}
\ No newline at end of file
+    },
+    "files": [
+        "index.d.ts",
+        "react-tag-input-tests.ts"
+    ]
+}
diff --git a/types/react-tag-input/tslint.json b/types/react-tag-input/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-tag-input/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 11f6048075f6bc7fd770a6cfbb9d29401af1679c Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Tue, 27 Jun 2017 05:58:11 -0400
Subject: [PATCH 073/287] [jquery] Fix typo that broke a bunch of tests.

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

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index f34cc443a5..b4b4f10aaf 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3482,10 +3482,10 @@ function JQueryStatic() {
     }
 
     function call_signature() {
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $('<p></p>', new Document());
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $('<p></p>', {
             class: 'my-div',
             on: {
@@ -3495,149 +3495,149 @@ function JQueryStatic() {
             }
         });
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $('span', new HTMLElement());
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $('span', new Document());
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $('span', $('p'));
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $('span');
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $('<p></p>');
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $(new HTMLElement());
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $([new HTMLElement()]);
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $({ foo: 'bar', hello: 'world' });
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $($('p'));
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $(function($) {
-            // #ExpectType Document
+            // $ExpectType Document
             this;
-            // #ExpectType JQueryStatic<HTMLElement>
+            // $ExpectType JQueryStatic<HTMLElement>
             $;
         });
 
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $();
     }
 
     function Event() {
-        // #ExpectType Event<HTMLElement>
+        // $ExpectType EventStatic<HTMLElement>
         $.Event;
     }
 
     function cssHooks() {
-        // #ExpectType PlainObject<CSSHook<HTMLElement>>
+        // $ExpectType PlainObject<CSSHook<HTMLElement>>
         $.cssHooks;
     }
 
     function cssNumber() {
-        // #ExpectType PlainObject<boolean>
+        // $ExpectType PlainObject<boolean>
         $.cssNumber;
     }
 
     function fn() {
-        // #ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<HTMLElement>
         $.fn;
     }
 
     function fx() {
         function interval() {
-            // #ExpectType JQuery<number>
+            // $ExpectType number
             $.fx.interval;
         }
 
         function off() {
-            // #ExpectType boolean
+            // $ExpectType boolean
             $.fx.off;
         }
 
         function step() {
-            // #ExpectType PlainObject<AnimationHook<HTMLElement>>
+            // $ExpectType PlainObject<AnimationHook<HTMLElement>>
             $.fx.step;
         }
     }
 
     function ready() {
-        // #ExpectType Thenable<JQueryStatic<HTMLElement>>
+        // $ExpectType Thenable<JQueryStatic<HTMLElement>>
         $.ready;
     }
 
     function support() {
-        // #ExpectType PlainObject
+        // $ExpectType PlainObject<any>
         $.support;
     }
 
     function valHooks() {
-        // #ExpectType PlainObject<ValHook<HTMLElement>>
+        // $ExpectType PlainObject<ValHook<HTMLElement>>
         $.valHooks;
     }
 
     function Callbacks() {
-        // #ExpectType Callbacks
+        // $ExpectType Callbacks<Function>
         $.Callbacks('once');
 
-        // #ExpectType Callbacks
+        // $ExpectType Callbacks<Function>
         $.Callbacks();
     }
 
     function Deferred() {
         function call_signature() {
-            // #ExpectType Deferred<boolean, string, number>
+            // $ExpectType Deferred<boolean, string, number>
             $.Deferred<boolean, string, number>(function(deferred) {
-                // #ExpectType Deferred<boolean, string, number>
+                // $ExpectType Deferred<boolean, string, number>
                 this;
-                // #ExpectType Deferred<boolean, string, number>
+                // $ExpectType Deferred<boolean, string, number>
                 deferred;
             });
 
-            // #ExpectType Deferred<boolean, string, number>
+            // $ExpectType Deferred<boolean, string, number>
             $.Deferred<boolean, string, number>();
 
-            // #ExpectType Deferred<boolean, string, any>
+            // $ExpectType Deferred<boolean, string, any>
             $.Deferred<boolean, string>(function(deferred) {
-                // #ExpectType Deferred<boolean, string, any>
+                // $ExpectType Deferred<boolean, string, any>
                 this;
-                // #ExpectType Deferred<boolean, string, any>
+                // $ExpectType Deferred<boolean, string, any>
                 deferred;
             });
 
-            // #ExpectType Deferred<boolean, string, any>
+            // $ExpectType Deferred<boolean, string, any>
             $.Deferred<boolean, string>();
 
-            // #ExpectType Deferred<boolean, any, any>
+            // $ExpectType Deferred<boolean, any, any>
             $.Deferred<boolean>(function(deferred) {
-                // #ExpectType Deferred<boolean, any, any>
+                // $ExpectType Deferred<boolean, any, any>
                 this;
-                // #ExpectType Deferred<boolean, any, any>
+                // $ExpectType Deferred<boolean, any, any>
                 deferred;
             });
 
-            // #ExpectType Deferred<boolean, any, any>
+            // $ExpectType Deferred<boolean, any, any>
             $.Deferred<boolean>();
 
-            // #ExpectType Deferred<any, any, any>
+            // $ExpectType Deferred<any, any, any>
             $.Deferred(function(deferred) {
-                // #ExpectType Deferred<any, any, any>
+                // $ExpectType Deferred<any, any, any>
                 this;
-                // #ExpectType Deferred<any, any, any>
+                // $ExpectType Deferred<any, any, any>
                 deferred;
             });
 
-            // #ExpectType Deferred<any, any, any>
+            // $ExpectType Deferred<any, any, any>
             $.Deferred();
         }
 

From fe2e1fc21f8fb0ff04c02fc5d0a9639b41bd3935 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Tue, 27 Jun 2017 13:49:34 +0200
Subject: [PATCH 074/287] Update index.d.ts

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

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index e304f19e77..fe7fcd28a8 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -23,4 +23,4 @@ export interface TagItem {
 
 export class WithContext extends React.Component<ReactTagsProps, {}> { }
 
-export default WithContext;
\ No newline at end of file
+export default WithContext;

From 8ec10d94be3a111df49764f69ee7c84cdbec16b6 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Tue, 27 Jun 2017 08:12:06 -0400
Subject: [PATCH 075/287] [jquery] No null.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index b4c4d37387..69196b6d00 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -2330,7 +2330,7 @@ interface JQuery<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/val/}
      * @since 1.0
      */
-    val(): string | number | string[] | null | undefined;
+    val(): string | number | string[] | undefined;
     /**
      * Set the CSS width of each element in the set of matched elements.
      *
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index b4b4f10aaf..7b0c521b88 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3028,7 +3028,7 @@ function JQuery() {
                 return 'myVal';
             });
 
-            // $ExpectType string | number | string[] | null | undefined
+            // $ExpectType string | number | string[] | undefined
             $('p').val();
         }
     }

From bf57cf89e24d4d4fb695f50cb5d53356d1fb7f86 Mon Sep 17 00:00:00 2001
From: Luka Zakrajsek <luka@bancek.net>
Date: Tue, 27 Jun 2017 14:43:22 +0200
Subject: [PATCH 076/287] Update definitions by

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

diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 84bf7fbd8d..acf1dcc857 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for redux-form 6.6
 // 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>
+// 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.3
 

From 52d5d86679a51368170e3201d0cde3563821a204 Mon Sep 17 00:00:00 2001
From: Vu Tran <vutran@dropbox.com>
Date: Tue, 27 Jun 2017 09:03:17 -0700
Subject: [PATCH 077/287] Add typings for is-alphanumerical

---
 is-alphanumerical/index.d.ts                 |  7 +++++++
 is-alphanumerical/is-alphanumerical-tests.ts |  7 +++++++
 is-alphanumerical/tsconfig.json              | 22 ++++++++++++++++++++
 is-alphanumerical/tslint.json                |  1 +
 4 files changed, 37 insertions(+)
 create mode 100644 is-alphanumerical/index.d.ts
 create mode 100644 is-alphanumerical/is-alphanumerical-tests.ts
 create mode 100644 is-alphanumerical/tsconfig.json
 create mode 100644 is-alphanumerical/tslint.json

diff --git a/is-alphanumerical/index.d.ts b/is-alphanumerical/index.d.ts
new file mode 100644
index 0000000000..5974ec9813
--- /dev/null
+++ b/is-alphanumerical/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for is-alphanumerical 1.0
+// Project: https://github.com/wooorm/is-alphanumerical/
+// Definitions by: Vu Tran <https://github.com/vutran>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isAlphanumerical(val: string | boolean | string): boolean;
+export = isAlphanumerical;
diff --git a/is-alphanumerical/is-alphanumerical-tests.ts b/is-alphanumerical/is-alphanumerical-tests.ts
new file mode 100644
index 0000000000..3d6602c6df
--- /dev/null
+++ b/is-alphanumerical/is-alphanumerical-tests.ts
@@ -0,0 +1,7 @@
+import isAlphanumerical = require('is-alphanumerical');
+
+isAlphanumerical('a');
+isAlphanumerical('z');
+isAlphanumerical('0');
+isAlphanumerical('9');
+isAlphanumerical('💩');
diff --git a/is-alphanumerical/tsconfig.json b/is-alphanumerical/tsconfig.json
new file mode 100644
index 0000000000..481957289e
--- /dev/null
+++ b/is-alphanumerical/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",
+        "is-alphanumerical-tests.ts"
+    ]
+}
diff --git a/is-alphanumerical/tslint.json b/is-alphanumerical/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/is-alphanumerical/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c4089d41babf03607b720f19357acab6d5a06ef2 Mon Sep 17 00:00:00 2001
From: Blake Embrey <hello@blakeembrey.com>
Date: Tue, 27 Jun 2017 12:19:30 -0400
Subject: [PATCH 078/287] [knex] Allow `Raw` for index creation

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

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index fa84243b76..8149434b6b 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -403,14 +403,14 @@ declare namespace Knex {
         comment(val: string): TableBuilder;
         specificType(columnName: string, type: string): ColumnBuilder;
         primary(columnNames: string[]): TableBuilder;
-        index(columnNames: string[], indexName?: string, indexType?: string): TableBuilder;
-        unique(columnNames: string[], indexName?: string): TableBuilder;
+        index(columnNames: (string | Raw)[], indexName?: string, indexType?: string): TableBuilder;
+        unique(columnNames: (string | Raw)[], indexName?: string): TableBuilder;
         foreign(column: string): ForeignConstraintBuilder;
         foreign(columns: string[]): MultikeyForeignConstraintBuilder;
         dropForeign(columnNames: string[], foreignKeyName?: string): TableBuilder;
-        dropUnique(columnNames: string[], indexName?: string): TableBuilder;
+        dropUnique(columnNames: (string | Raw)[], indexName?: string): TableBuilder;
         dropPrimary(constraintName?: string): TableBuilder;
-        dropIndex(columnNames: string[], indexName?: string): TableBuilder;
+        dropIndex(columnNames: (string | Raw)[], indexName?: string): TableBuilder;
     }
 
     interface CreateTableBuilder extends TableBuilder {

From 56569fa44491c48831f39b1ca91c8c3797c26b37 Mon Sep 17 00:00:00 2001
From: Melvin Lee <zy@zy.sg>
Date: Wed, 28 Jun 2017 00:26:52 +0800
Subject: [PATCH 079/287] Fix strictNullChecks not set to true

---
 types/qs/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/qs/tsconfig.json b/types/qs/tsconfig.json
index 13f816338d..624bdc72f2 100644
--- a/types/qs/tsconfig.json
+++ b/types/qs/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,4 +19,4 @@
         "index.d.ts",
         "qs-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 0b503ea34ba9faad250b052a4b32ebbc8260843e Mon Sep 17 00:00:00 2001
From: Melvin Lee <zy@zy.sg>
Date: Wed, 28 Jun 2017 00:29:06 +0800
Subject: [PATCH 080/287] Update qs to 6.4.0

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

diff --git a/types/qs/index.d.ts b/types/qs/index.d.ts
index 400cc7a1e4..b4f27c1304 100644
--- a/types/qs/index.d.ts
+++ b/types/qs/index.d.ts
@@ -1,7 +1,9 @@
-// Type definitions for qs 6.2.0
-// Project: https://github.com/hapijs/qs
-// Definitions by: Roman Korneev <https://github.com/RWander>, Leon Yu <https://github.com/leonyu>,
-//     Belinda Teh <https://github.com/tehbelinda>
+// Type definitions for qs 6.4.0
+// Project: https://github.com/ljharb/qs
+// Definitions by: Roman Korneev <https://github.com/RWander>
+//                 Leon Yu <https://github.com/leonyu>
+//                 Belinda Teh <https://github.com/tehbelinda>
+//                 Melvin Lee <https://github.com/zyml>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = QueryString;
@@ -18,6 +20,9 @@ declare namespace QueryString {
         arrayFormat?: 'indices' | 'brackets' | 'repeat';
         indices?: boolean;
         sort?: (a: any, b: any) => number;
+        serializeDate?: (d: Date) => any;
+        format?: 'RFC1738' | 'RFC3986';
+        encodeValuesOnly?: boolean;
     }
 
     interface IParseOptions {
diff --git a/types/qs/qs-tests.ts b/types/qs/qs-tests.ts
index f3e5ca3230..3d21daa46c 100644
--- a/types/qs/qs-tests.ts
+++ b/types/qs/qs-tests.ts
@@ -254,3 +254,27 @@ qs.parse('a=b&c=d', { delimiter: '&' });
     var sorted = qs.stringify({ a: 1, c: 3, b: 2 }, { sort: (a, b) => a.localeCompare(b) })
     assert.equal(sorted, 'a=1&b=2&c=3')
 }
+
+() => {
+    var date = new Date(7);
+    assert.equal(
+        qs.stringify({ a: date }, { serializeDate: function (d) { return d.getTime(); } }),
+        'a=7'
+    );
+}
+
+() => {
+    assert.equal(qs.stringify({ a: 'b c' }, { format : 'RFC3986' }), 'a=b%20c');
+}
+
+() => {
+    assert.equal(qs.stringify({ a: 'b c' }, { format : 'RFC1738' }), 'a=b+c');
+}
+
+() => {
+    var encodedValues = qs.stringify(
+        { a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] },
+        { encodeValuesOnly: true }
+    );
+    assert.equal(encodedValues,'a=b&c[0]=d&c[1]=e%3Df&f[0][0]=g&f[1][0]=h');
+}

From cbe52a3ac27d723b5158df7ab567aeb1322259d8 Mon Sep 17 00:00:00 2001
From: amikhalev <alexmikhalevalex@gmail.com>
Date: Tue, 27 Jun 2017 10:47:47 -0600
Subject: [PATCH 081/287] Updated definitions for @types/yargs

Updated definitions for yargs 8.0 and fixed version number
Added tslint.json file and fixed all lint errors
Removed uses of Object and replaced with either any or a more specific
type
Fixed type of `choices` to accept undefined and true, because those are
accepted and functional values
Formatted everything
---
 types/yargs/index.d.ts     |  37 +++--
 types/yargs/tslint.json    |   1 +
 types/yargs/yargs-tests.ts | 296 +++++++++++++++++++------------------
 3 files changed, 174 insertions(+), 160 deletions(-)
 create mode 100644 types/yargs/tslint.json

diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index 9c581611db..02d4c6cb69 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -1,8 +1,15 @@
-// Type definitions for yargs 6.6.0
+// Type definitions for yargs 8.0
 // Project: https://github.com/chevex/yargs
-// Definitions by: Martin Poelstra <https://github.com/poelstra>, Mizunashi Mana <https://github.com/mizunashi-mana>, Jeffery Grajkowski <https://github.com/pushplay>, Jeff Kenney <https://github.com/jeffkenney>
+// Definitions by: Martin Poelstra <https://github.com/poelstra>
+//                 Mizunashi Mana <https://github.com/mizunashi-mana>
+//                 Jeffery Grajkowski <https://github.com/pushplay>
+//                 Jeff Kenney <https://github.com/jeffkenney>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// unified-signatures: Because there is useful information in the argument names of the overloaded signatures
+// prefer-method-signature: Because it makes more sense for optional functions provided in options objects
+/* tslint:disable:unified-signatures prefer-method-signature */
+
 declare namespace yargs {
     interface Argv {
         argv: any;
@@ -108,15 +115,15 @@ declare namespace yargs {
         number(key: string): Argv;
         number(keys: string[]): Argv;
 
-        choices(choices: Object): Argv;
-        choices(key: string, values: any[]): Argv;
+        choices(choices: { [argName: string]: Choices }): Argv;
+        choices(key: string, values: Choices): Argv;
 
         config(): Argv;
-        config(explicitConfigurationObject: Object): Argv;
-        config(key: string, description?: string, parseFn?: (configPath: string) => Object): Argv;
-        config(keys: string[], description?: string, parseFn?: (configPath: string) => Object): Argv;
-        config(key: string, parseFn: (configPath: string) => Object): Argv;
-        config(keys: string[], parseFn: (configPath: string) => Object): Argv;
+        config(explicitConfigurationObject: any): Argv;
+        config(key: string, description?: string, parseFn?: (configPath: string) => any): Argv;
+        config(keys: string[], description?: string, parseFn?: (configPath: string) => any): Argv;
+        config(key: string, parseFn: (configPath: string) => any): Argv;
+        config(keys: string[], parseFn: (configPath: string) => any): Argv;
 
         conflicts(key: string, value: string): Argv;
         conflicts(conflicts: { [key: string]: string }): Argv;
@@ -180,9 +187,9 @@ declare namespace yargs {
         skipValidation(key: string): Argv;
         skipValidation(keys: string[]): Argv;
 
-        updateLocale(obj: Object): Argv;
+        updateLocale(obj: { [key: string]: string }): Argv;
 
-        updateStrings(obj: {[key: string]: string}): Argv;
+        updateStrings(obj: { [key: string]: string }): Argv;
     }
 
     interface RequireDirectoryOptions {
@@ -197,10 +204,10 @@ declare namespace yargs {
         alias?: string | string[];
         array?: boolean;
         boolean?: boolean;
-        choices?: string[];
+        choices?: Choices;
         coerce?: (arg: any) => any;
         config?: boolean;
-        configParser?: (configPath: string) => Object;
+        configParser?: (configPath: string) => any;
         count?: boolean;
         default?: any;
         defaultDescription?: string;
@@ -231,9 +238,11 @@ declare namespace yargs {
         handler: (args: any) => void;
     }
 
-    type CommandBuilder = {[key: string]: Options} | ((args: Argv) => Argv);
+    type CommandBuilder = { [key: string]: Options } | ((args: Argv) => Argv);
     type SyncCompletionFunction = (current: string, argv: any) => string[];
     type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
+    type Choice = string | true | undefined;
+    type Choices = Choice[];
 }
 
 declare var yargs: yargs.Argv;
diff --git a/types/yargs/tslint.json b/types/yargs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yargs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index f68c1113e9..8a0120f80d 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -12,31 +12,30 @@ const stringVal = 'string';
 
 // With yargs, the options be just a hash!
 function xup() {
-    var argv = yargs.argv;
+    let argv = yargs.argv;
 
     if (argv.rif - 5 * argv.xup > 7.138) {
         console.log('Plunder more riffiwobbles!');
-    }
-    else {
+    } else {
         console.log('Drop the xupptumblers!');
     }
 }
 
 // And non-hyphenated options too! Just use argv._!
 function nonopt() {
-    var argv = yargs.argv;
+    let argv = yargs.argv;
     console.log('(%d,%d)', argv.x, argv.y);
     console.log(argv._);
 }
 
 // Yargs even counts your booleans!
 function count() {
-    var argv = yargs
+    let argv = yargs
         .count('verbose')
         .alias('v', 'verbose')
         .argv;
 
-    var VERBOSE_LEVEL: number = argv.verbose;
+    let VERBOSE_LEVEL: number = argv.verbose;
 
     function WARN() { VERBOSE_LEVEL >= 0 && console.log.apply(console, arguments); }
     function INFO() { VERBOSE_LEVEL >= 1 && console.log.apply(console, arguments); }
@@ -45,7 +44,7 @@ function count() {
 
 // Tell users how to use yer options and make demands.
 function divide() {
-    var argv = yargs
+    let argv = yargs
         .usage('Usage: $0 -x [num] -y [num]')
         .demand(['x', 'y'])
         .argv;
@@ -55,7 +54,7 @@ function divide() {
 
 // After yer demands have been met, demand more! Ask for non-hypenated arguments!
 function demand_count() {
-    var argv = yargs
+    let argv = yargs
         .demand(2)
         .demand(2, false)
         .demand(2, 2)
@@ -66,63 +65,63 @@ function demand_count() {
 
 // EVEN MORE SHIVER ME TIMBERS!
 function default_singles() {
-    var argv = yargs
+    let argv = yargs
         .default('x', 10)
         .default('y', 10)
         .argv
-    ;
+        ;
     console.log(argv.x + argv.y);
 }
 function default_hash() {
-    var argv = yargs
+    let argv = yargs
         .default({ x: 10, y: 10 })
         .argv
-    ;
+        ;
     console.log(argv.x + argv.y);
 }
 
 // And if you really want to get all descriptive about it...
 function boolean_single() {
-    var argv = yargs
+    let argv = yargs
         .boolean('v')
         .argv
-    ;
+        ;
     console.dir(argv.v);
     console.dir(argv._);
 }
 function boolean_double() {
-    var argv = yargs
+    let argv = yargs
         .boolean(['x', 'y', 'z'])
         .argv
-    ;
+        ;
     console.dir([argv.x, argv.y, argv.z]);
     console.dir(argv._);
 }
 
 // Yargs is here to help you...
 function line_count() {
-    var argv = yargs
+    let argv = yargs
         .usage('Count the lines in a file.\nUsage: $0')
         .example('$0 -f', 'count the lines in the given file')
         .demand('f')
         .alias('f', 'file')
         .describe('f', 'Load a file')
         .argv
-    ;
+        ;
 }
 
 // Below are tests for individual methods.
 // Not all methods are covered yet, and neither are all possible invocations of methods.
 
 function Argv_parsing() {
-    var argv1 = yargs.argv;
-    var argv2 = yargs(['-x', '1', '-y', '2']).argv;
-    var argv3 = yargs.parse(['-x', '1', '-y', '2']);
+    let argv1 = yargs.argv;
+    let argv2 = yargs(['-x', '1', '-y', '2']).argv;
+    let argv3 = yargs.parse(['-x', '1', '-y', '2']);
     console.log(argv1.x, argv2.x, argv3.x);
 }
 
 function Argv$options() {
-    var argv1 = yargs
+    let argv1 = yargs
         .options('f', {
             alias: 'file',
             default: '/etc/passwd',
@@ -134,58 +133,64 @@ function Argv$options() {
             nargs: 3
         })
         .argv
-    ;
+        ;
 
-    var argv2 = yargs
+    let argv2 = yargs
         .alias('f', 'file')
         .default('f', '/etc/passwd')
         .argv
-    ;
+        ;
 }
 
 function Argv$global() {
-    var argv = yargs
+    let argv = yargs
         .global('foo')
-        .global(['bar', 'baz', 'fizz', 'buzz'])
+        .global(['bar', 'baz', 'fizz', 'buzz']);
 }
 
 function Argv$group() {
-    var argv = yargs
+    let argv = yargs
         .group('foo', 'foogroup')
-        .group(['bing', 'bang', 'buzz'], 'onomatopoeia')
+        .group(['bing', 'bang', 'buzz'], 'onomatopoeia');
 }
 
 function Argv$env() {
-    var argv = yargs
+    let argv = yargs
         .env('YARGS_PREFIX_')
         .env()
         .env(true);
 }
 
 function Argv$array() {
-    var argv = yargs
+    let argv = yargs
         .array('foo')
-        .array(['bar', 'baz'])
+        .array(['bar', 'baz']);
 }
 
 function Argv$nargs() {
-    var argv = yargs
+    let argv = yargs
         .nargs('foo', 12)
-        .nargs({ 'bing': 3, 'bang': 2, 'buzz': 4 })
+        .nargs({ bing: 3, bang: 2, buzz: 4 });
 }
 
 function Argv$choices() {
     // example from documentation
-    var argv = yargs
-      .alias('i', 'ingredient')
-      .describe('i', 'choose your sandwich ingredients')
-      .choices('i', ['peanut-butter', 'jelly', 'banana', 'pickles'])
-      .help('help')
-      .argv
+    let argv = yargs
+        .alias('i', 'ingredient')
+        .describe('i', 'choose your sandwich ingredients')
+        .choices('i', ['peanut-butter', 'jelly', 'banana', 'pickles'])
+        .help('help')
+        .argv;
+
+    yargs
+        .choices('i', [undefined, true, 'asdf', 'test'])
+        .choices({
+            test: [undefined, true, 'test-value']
+        });
 }
 
 function command() {
-    var argv = yargs
+    let argv = yargs
         .usage('npm <command>')
         .command('install', 'tis a mighty fine package to install')
         .command('publish', 'shiver me timbers, should you be sharing all that', yargs =>
@@ -193,7 +198,7 @@ function command() {
                 alias: 'force',
                 description: 'yar, it usually be a bad idea'
             })
-            .help('help')
+                .help('help')
         )
         .command("build", "arghh, build it mate", {
             tag: {
@@ -203,7 +208,7 @@ function command() {
             },
             publish: {
                 default: false,
-                description:"Should i publish?"
+                description: "Should i publish?"
             }
         })
         .command({
@@ -227,35 +232,35 @@ function command() {
         .argv;
 
     yargs
-        .command('get', 'make a get HTTP request', function (yargs) {
+        .command('get', 'make a get HTTP request', (yargs) => {
             return yargs.option('url', {
                 alias: 'u',
                 default: 'http://yargs.js.org/'
-            })
+            });
         })
         .help()
-        .argv
+        .argv;
 
     yargs
         .command(
-            'get',
-            'make a get HTTP request',
-            function (yargs) {
-                return yargs.option('u', {
-                    alias: 'url',
-                    describe: 'the URL to make an HTTP request to'
-                })
-            },
-            function (argv: { url: string }) {
-                console.dir(argv.url)
-            }
+        'get',
+        'make a get HTTP request',
+        (yargs) => {
+            return yargs.option('u', {
+                alias: 'url',
+                describe: 'the URL to make an HTTP request to'
+            });
+        },
+        (argv: { url: string }) => {
+            console.dir(argv.url);
+        }
         )
         .help()
-        .argv
+        .argv;
 }
 
 function completion_sync() {
-    var argv = yargs
+    let argv = yargs
         .completion('completion', (current, argv) => {
             // 'current' is the current command being completed.
             // 'argv' is the parsed arguments so far.
@@ -269,9 +274,9 @@ function completion_sync() {
 }
 
 function completion_async() {
-    var argv = yargs
+    let argv = yargs
         .completion('completion', (current: string, argv: any, done: (completion: string[]) => void) => {
-            setTimeout(function () {
+            setTimeout(() => {
                 done([
                     'apple',
                     'banana'
@@ -282,14 +287,14 @@ function completion_async() {
 }
 
 function Argv$help() {
-    var argv = yargs
+    let argv = yargs
         .usage("$0 -operand1 number -operand2 number -operation [add|subtract]")
         .help()
         .argv;
 }
 
 function Argv$showHelpOnFail() {
-    var argv = yargs
+    let argv = yargs
         .usage('Count the lines in a file.\nUsage: $0')
         .demand('f')
         .alias('f', 'file')
@@ -299,72 +304,72 @@ function Argv$showHelpOnFail() {
 }
 
 function Argv$showHelp() {
-    var yargs1 = yargs
+    let yargs1 = yargs
         .usage("$0 -operand1 number -operand2 number -operation [add|subtract]");
     yargs1.showHelp();
 }
 
 function Argv$version() {
-    var argv1 = yargs
+    let argv1 = yargs
         .version();
 
-    var argv2 = yargs
+    let argv2 = yargs
         .version('1.0.0');
 
-    var argv3 = yargs
+    let argv3 = yargs
         .version('1.0.0', '--version');
 
-    var argv4 = yargs
+    let argv4 = yargs
         .version('1.0.0', '--version', 'description');
 
-    var argv5 = yargs
-        .version(function () { return '1.0.0'; }, '--version', 'description');
+    let argv5 = yargs
+        .version(() => '1.0.0', '--version', 'description');
 }
 
 function Argv$wrap() {
-    var argv1 = yargs
+    let argv1 = yargs
         .wrap(null);
 
-    var argv2 = yargs
+    let argv2 = yargs
         .wrap(yargs.terminalWidth());
 }
 
 function Argv$locale() {
-    var argv = yargs
+    let argv = yargs
         .usage('./$0 - follow ye instructions true')
         .option('option', {
-        alias: 'o',
-        describe: "'tis a mighty fine option",
-        demand: true
+            alias: 'o',
+            describe: "'tis a mighty fine option",
+            demand: true
         })
         .command('run', "Arrr, ya best be knowin' what yer doin'")
         .example('$0 run foo', "shiver me timbers, here's an example for ye")
         .help('help')
         .wrap(70)
         .locale('pirate')
-        .argv
+        .argv;
 }
 
 function Argv$epilogue() {
-    var argv = yargs
+    let argv = yargs
         .epilogue('for more information, find our manual at http://example.com');
 }
 
 function Argv$reset() {
-    var ya = yargs
+    let ya = yargs
         .usage('$0 command')
         .command('hello', 'hello command')
         .command('world', 'world command')
-        .demand(1, 'must provide a valid command'),
-        argv = yargs.argv,
-        command = argv._[0];
+        .demand(1, 'must provide a valid command');
+    let argv = yargs.argv;
+    let command = argv._[0];
 
     if (command === 'hello') {
         ya.reset()
             .usage('$0 hello')
             .help('h')
             .example('$0 hello', 'print the hello message!')
-            .argv
+            .argv;
 
         console.log('hello!');
     } else if (command === 'world') {
@@ -372,7 +377,7 @@ function Argv$reset() {
             .usage('$0 world')
             .help('h')
             .example('$0 world', 'print the world message!')
-            .argv
+            .argv;
 
         console.log('world!');
     } else {
@@ -382,15 +387,14 @@ function Argv$reset() {
 
 // http://yargs.js.org/docs/#methods-commanddirdirectory-opts
 function Argv$commandDir() {
-    var ya = yargs
+    let ya = yargs
         .commandDir('.')
-        .argv
+        .argv;
 }
 
-
 // http://yargs.js.org/docs/#methods-commanddirdirectory-opts
 function Argv$commandDirWithOptions() {
-    var ya = yargs
+    let ya = yargs
         .commandDir('.', {
             recurse: false,
             extensions: ['js'],
@@ -398,159 +402,159 @@ function Argv$commandDirWithOptions() {
             include: /.*\.js$/,
             exclude: /.*\.spec.js$/,
         })
-        .argv
+        .argv;
 }
 
 function Argv$normalize() {
-    var ya = yargs
+    let ya = yargs
         .normalize('path')
         .normalize(['user', 'group'])
-        .argv
+        .argv;
 }
 
 // From http://yargs.js.org/docs/#methods-coercekey-fn
 function Argv$coerce() {
-    var ya = yargs
-        .coerce('file', function (arg: string) {
+    let ya = yargs
+        .coerce('file', (arg: string) => {
             return fs.readFileSync(arg, 'utf8');
         })
-        .argv
+        .argv;
 }
 function Argv$coerces() {
-    var ya = yargs
+    let ya = yargs
         .coerce({
             date: Date.parse,
             json: JSON.parse
         })
-        .argv
+        .argv;
 }
 function Argv$coerceWithKeys() {
-    var ya = yargs
+    let ya = yargs
         .coerce(['src', 'dest'], path.resolve)
-        .argv
+        .argv;
 }
 
 // From http://yargs.js.org/docs/#methods-failfn
 function Argv$fail() {
-    var ya = yargs
-        .fail(function (msg, err) {
-            if (err) throw err // preserve stack
-            console.error('You broke it!')
-            console.error(msg)
-            process.exit(1)
+    let ya = yargs
+        .fail((msg, err) => {
+            if (err) throw err; // preserve stack
+            console.error('You broke it!');
+            console.error(msg);
+            process.exit(1);
         })
-        .argv
+        .argv;
 }
 
 function Argv$implies() {
-    var ya = yargs
+    let ya = yargs
         .implies('foo', 'snuh')
         .implies({
             x: 'y'
         })
-        .argv
+        .argv;
 }
 
 function Argv$count() {
-    var ya = yargs
+    let ya = yargs
         .count('size')
         .count(['w', 'h'])
-        .argv
+        .argv;
 }
 
 function Argv$number() {
-    var ya = yargs
+    let ya = yargs
         .number('n')
         .number(['width', 'height'])
-        .argv
+        .argv;
 }
 
 function Argv$updateStrings() {
-    var ya = yargs
+    let ya = yargs
         .command('run', 'the run command')
         .help('help')
         .updateStrings({
             'Commands:': 'My Commands -->\n'
         })
         .wrap(null)
-        .argv
+        .argv;
 }
 
 function Argv$default() {
-    var ya = yargs
+    let ya = yargs
         .default('random', function randomValue() {
             return Math.random() * 256;
         })
-        .argv
+        .argv;
 }
 
 function Argv$configObject() {
-    var ya = yargs
-        .config({foo: 1, bar: 2})
-        .argv
+    let ya = yargs
+        .config({ foo: 1, bar: 2 })
+        .argv;
 }
 
 function Argv$configParseFunction() {
-    var ya = yargs
-        .config('settings', function (configPath) {
-            return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
+    let ya = yargs
+        .config('settings', (configPath) => {
+            return JSON.parse(fs.readFileSync(configPath, 'utf-8'));
         })
-        .config('settings', 'description', function (configPath) {
-            return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
+        .config('settings', 'description', (configPath) => {
+            return JSON.parse(fs.readFileSync(configPath, 'utf-8'));
         })
-        .argv
+        .argv;
 }
 
 function Argv$helpDescriptionExplicit() {
-    var ya = yargs
+    let ya = yargs
         .help('help', 'description', true)
-        .argv
+        .argv;
 }
 
 function Argv$showHelpConsoleLevel() {
-    yargs.showHelp("log"); //prints to stdout using console.log()
+    yargs.showHelp("log"); // prints to stdout using console.log()
 }
 
 function Argv$getCompletion() {
-    var ya = yargs
+    let ya = yargs
         .option('foobar', {})
         .option('foobaz', {})
         .completion()
-        .getCompletion(['./test.js', '--foo'], function (completions) {
-            console.log(completions)
+        .getCompletion(['./test.js', '--foo'], (completions) => {
+            console.log(completions);
         })
-        .argv
+        .argv;
 }
 
 function Argv$pkgConf() {
-    var ya = yargs
+    let ya = yargs
         .pkgConf(['key1', 'key2'], 'configFile.json')
-        .argv
+        .argv;
 }
 
 function Argv$recommendCommands() {
-    var ya = yargs
+    let ya = yargs
         .recommendCommands()
-        .argv
+        .argv;
 }
 
 function Argv$showCompletionScript() {
-    var ya = yargs
+    let ya = yargs
         .showCompletionScript()
-        .argv
+        .argv;
 }
 
 function Argv$skipValidation() {
-    var ya = yargs
+    let ya = yargs
         .skipValidation('arg1')
         .skipValidation(['arg2', 'arg3'])
-        .argv
+        .argv;
 }
 
 function Argv$commandObject() {
-    var ya = yargs
+    let ya = yargs
         .command("commandname", "description", {
-            "arg": {
+            arg: ({
                 alias: "string",
                 array: true,
                 boolean: true,
@@ -575,12 +579,12 @@ function Argv$commandObject() {
                 skipValidation: false,
                 string: true,
                 type: "string"
-            }
-        })
+            } as yargs.Options)
+        });
 }
 
 function Argv$demandCommand() {
-    var ya = yargs
+    let ya = yargs
         .demandCommand(1)
         .demandCommand(1, 'at least 1 command required')
         .demandCommand(1, 2)
@@ -590,7 +594,7 @@ function Argv$demandCommand() {
 }
 
 function Argv$demandOption() {
-    var ya = yargs
+    let ya = yargs
         .demandOption('a')
         .demandOption('a', 'a is required')
         .demandOption('a', true)
@@ -601,7 +605,7 @@ function Argv$demandOption() {
 }
 
 function Argv$conflicts() {
-    var ya = yargs
+    let ya = yargs
         .conflicts('a', 'b')
         .conflicts({
             a: 'b'

From ca1b41d823a17c0f836a9ed4a3872f76030ecf85 Mon Sep 17 00:00:00 2001
From: wagich <wagi_ch@gmx.net>
Date: Tue, 27 Jun 2017 19:14:12 +0200
Subject: [PATCH 082/287] Adds localization to flatpickr

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

diff --git a/types/flatpickr/index.d.ts b/types/flatpickr/index.d.ts
index 535ec0145e..57c3d60213 100644
--- a/types/flatpickr/index.d.ts
+++ b/types/flatpickr/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/chmln/flatpickr
 // Definitions by: James Birtles <https://github.com/UnwrittenFun>
 //                 Rowell Heria <https://github.com/rowellx68>
+//                 Michael Wagner <https://github.com/wagich>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare function flatpickr(element: string | Element | HTMLElement, options?: Flatpickr.Options): Flatpickr;
@@ -21,6 +22,11 @@ declare class Flatpickr {
     set(option: string, value: any): void;
     setDate(date: Flatpickr.DateString | Flatpickr.DateString[], triggerChange?: boolean, dateFormat?: string): void;
     toggle(): void;
+    
+    static localize(locale: string | Flatpickr.Locale): void;
+    static l10ns: {
+        default: Flatpickr.Locale;
+    }
 }
 
 declare namespace Flatpickr {
@@ -63,8 +69,32 @@ declare namespace Flatpickr {
         utc?: boolean;
         weekNumbers?: boolean;
         wrap?: boolean;
+        locale?: string | Locale;
     }
-
+    
+    interface Locale {
+        weekdays?: {
+            shorthand?: string[];
+            longhand?: string[];
+        };
+        
+        months?: {
+            shorthand?: string[];
+            longhand?: string[];
+        };
+        
+        firstDayOfWeek?: number;
+        weekAbbreviation?: string;
+        rangeSeparator?: string;
+        am?: string;
+        pm?: string;
+        
+        ordinal?: ((nth: number) => string) | string;
+        
+        scrollTitle?: string;
+        toggleTitle?: string;
+	}
+    
     type DateString = Date | string;
     type DateRange = DateString | { from: DateString, to: DateString } | ((date: Date) => boolean);
     type Mode = 'single' | 'multiple' | 'range';

From 1cce847cfeab6475e9e602557b5eeb30ea867657 Mon Sep 17 00:00:00 2001
From: wagich <wagi_ch@gmx.net>
Date: Tue, 27 Jun 2017 19:30:00 +0200
Subject: [PATCH 083/287] tries to make travis happy

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

diff --git a/types/flatpickr/index.d.ts b/types/flatpickr/index.d.ts
index 57c3d60213..fce4214c90 100644
--- a/types/flatpickr/index.d.ts
+++ b/types/flatpickr/index.d.ts
@@ -22,11 +22,11 @@ declare class Flatpickr {
     set(option: string, value: any): void;
     setDate(date: Flatpickr.DateString | Flatpickr.DateString[], triggerChange?: boolean, dateFormat?: string): void;
     toggle(): void;
-    
+
     static localize(locale: string | Flatpickr.Locale): void;
     static l10ns: {
         default: Flatpickr.Locale;
-    }
+    };
 }
 
 declare namespace Flatpickr {
@@ -71,30 +71,30 @@ declare namespace Flatpickr {
         wrap?: boolean;
         locale?: string | Locale;
     }
-    
+
     interface Locale {
         weekdays?: {
             shorthand?: string[];
             longhand?: string[];
         };
-        
+
         months?: {
             shorthand?: string[];
             longhand?: string[];
         };
-        
+
         firstDayOfWeek?: number;
         weekAbbreviation?: string;
         rangeSeparator?: string;
         am?: string;
         pm?: string;
-        
+
         ordinal?: ((nth: number) => string) | string;
-        
+
         scrollTitle?: string;
         toggleTitle?: string;
-	}
-    
+    }
+
     type DateString = Date | string;
     type DateRange = DateString | { from: DateString, to: DateString } | ((date: Date) => boolean);
     type Mode = 'single' | 'multiple' | 'range';

From a060f7558c73fc90139973f077b928923d4ad341 Mon Sep 17 00:00:00 2001
From: Alan Marcell <alanmarcell@live.com>
Date: Tue, 27 Jun 2017 16:44:32 -0300
Subject: [PATCH 084/287] Change replaceOne to Promise<UpdateWriteOpResult & {
 ops: Array<any> }>

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index aee64a729c..311e696c8a 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -587,9 +587,9 @@ export interface Collection<TSchema = Default> {
     rename(newName: string, options?: { dropTarget?: boolean }): Promise<Collection<TSchema>>;
     rename(newName: string, options: { dropTarget?: boolean }, callback: MongoCallback<Collection<TSchema>>): void;
     //http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#replaceOne
-    replaceOne(filter: Object, doc: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
-    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult> | Promise<WriteOpResult>;
-    replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
+    replaceOne(filter: Object, doc: Object, callback: MongoCallback<UpdateWriteOpResult & { ops: Array<any> }>): void;
+    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult & { ops: Array<any> }>;
+    replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult & { ops: Array<any> }>): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#save
     /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
     save(doc: Object, callback: MongoCallback<WriteOpResult>): void;

From 019645c0d1ae5a40dd90a0c2d4ed1ea86e542c9b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Jun 2017 12:58:05 -0700
Subject: [PATCH 085/287] Q: use PromiseLike and fix Q.all type inference

1. Q's IPromise changes to become the standard PromiseLike in order to fix
assignability in TS 2.4, which is more strict.
2. Q.all splits into more overloads in order to fix type parameter
inference in TS 2.4, which is more strict.
---
 types/q/index.d.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/types/q/index.d.ts b/types/q/index.d.ts
index 2a04f56847..56ada9590a 100644
--- a/types/q/index.d.ts
+++ b/types/q/index.d.ts
@@ -11,7 +11,7 @@ export as namespace Q;
  * If value is a Q promise, returns the promise.
  * If value is a promise from another library it is coerced into a Q promise (where possible).
  */
-declare function Q<T>(promise: Q.IPromise<T>): Q.Promise<T>;
+declare function Q<T>(promise: PromiseLike<T>): Q.Promise<T>;
 /**
  * If value is not a promise, returns a promise that is fulfilled with value.
  */
@@ -22,10 +22,9 @@ declare function Q<T>(value: T): Q.Promise<T>;
 declare function Q(): Q.Promise<void>;
 
 declare namespace Q {
-    export type IWhenable<T> = IPromise<T> | T;
-    export interface IPromise<T> {
-        then<U>(onFulfill?: (value: T) => IWhenable<U>, onReject?: (error: any) => IWhenable<U>): IPromise<U>;
-    }
+
+    export type IWhenable<T> = PromiseLike<T> | T;
+    export type IPromise<T> = PromiseLike<T>;
 
     export interface Deferred<T> {
         promise: Promise<T>;
@@ -224,7 +223,10 @@ declare namespace Q {
     /**
      * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
      */
-    export function all<A, B>(promises: IWhenable<[IWhenable<A>, IWhenable<B>]>): Promise<[A, B]>;
+    export function all<A, B>(promises: IWhenable<[IPromise<A>, IPromise<B>]>): Promise<[A, B]>;
+    export function all<A, B>(promises: IWhenable<[A, IPromise<B>]>): Promise<[A, B]>;
+    export function all<A, B>(promises: IWhenable<[IPromise<A>, B]>): Promise<[A, B]>;
+    export function all<A, B>(promises: IWhenable<[A, B]>): Promise<[A, B]>;
     /**
      * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
      */

From bde8a4160b0e148d0623fb2b30c56b1f67bdbe29 Mon Sep 17 00:00:00 2001
From: guillaumep <guillaume@guillaumepratte.net>
Date: Tue, 27 Jun 2017 16:54:37 -0400
Subject: [PATCH 086/287] Fix AppContainer for react-hot-loader 3.0.0-beta.7

Fixes error when using AppContainer in a TypeScript project:

ERROR in [at-loader] ./node_modules/@types/react-hot-loader/index.d.ts:18:35
    TS2314: Generic type 'Component<P, S>' requires 2 type argument(s).
---
 types/react-hot-loader/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-hot-loader/index.d.ts b/types/react-hot-loader/index.d.ts
index 214bd23f73..de8f5ee42d 100644
--- a/types/react-hot-loader/index.d.ts
+++ b/types/react-hot-loader/index.d.ts
@@ -15,4 +15,4 @@ export interface AppContainerProps {
   errorReporter?: React.ComponentClass<ErrorReporterProps> | React.StatelessComponent<ErrorReporterProps>
 }
 
-export class AppContainer extends React.Component<AppContainerProps> {}
+export class AppContainer extends React.Component<AppContainerProps, React.ComponentState> {}

From 6524517cd50dd71dbcd297629e02d16293db329d Mon Sep 17 00:00:00 2001
From: benbayard <bjbayard@gmail.com>
Date: Tue, 27 Jun 2017 14:36:41 -0700
Subject: [PATCH 087/287] Use new typescript definition for exported classes

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

diff --git a/types/react-dropzone/index.d.ts b/types/react-dropzone/index.d.ts
index 0c944b99cd..59eec06fe0 100644
--- a/types/react-dropzone/index.d.ts
+++ b/types/react-dropzone/index.d.ts
@@ -38,6 +38,9 @@ declare module "react-dropzone" {
         onFileDialogCancel?: () => void;
     }
 
-    let Dropzone: React.ClassicComponentClass<DropzoneProps>;
+    export declare class Dropzone extends React.Component<DropzoneProps, never> {
+        open(): void;
+        render(): JSX.Element;
+    }
     export = Dropzone;
 }

From b5de291251cbf6ff2d8ceeaeefc3895efe820406 Mon Sep 17 00:00:00 2001
From: benbayard <bjbayard@gmail.com>
Date: Tue, 27 Jun 2017 14:46:04 -0700
Subject: [PATCH 088/287] Add self to contributors

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

diff --git a/types/react-dropzone/index.d.ts b/types/react-dropzone/index.d.ts
index 59eec06fe0..94c6fc94b1 100644
--- a/types/react-dropzone/index.d.ts
+++ b/types/react-dropzone/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-dropzone
 // Project: https://github.com/okonet/react-dropzone
-// Definitions by: Mathieu Larouche Dube <https://github.com/matdube>, Ivo Jesus <https://github.com/LynxEyes>, Luís Rodrigues <https://github.com/goblindegook>
+// Definitions by: Mathieu Larouche Dube <https://github.com/matdube>, Ivo Jesus <https://github.com/LynxEyes>, Luís Rodrigues <https://github.com/goblindegook>, Ben Bayard <https://github.com/benbayard>
+
 // Definitions: https://github.com/Vooban/DefinitelyTyped
 // TypeScript Version: 2.3
 

From d2a6dc64c0fd75cdab1eff27d72170f86777a5c2 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Tue, 27 Jun 2017 17:53:13 -0400
Subject: [PATCH 089/287] [jquery] Revise Promise3.

---
 types/jquery/index.d.ts      | 590 +++++++++++++++++++++--------------
 types/jquery/jquery-tests.ts | 364 ++++++++++++++-------
 2 files changed, 599 insertions(+), 355 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 69196b6d00..e92560017d 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4620,6 +4620,19 @@ declare namespace JQuery {
         interface ProgressCallback<TNotify> extends Callback<TNotify> { }
     }
 
+    // Type parameter guide
+    // --------------------
+    // Each type parameter represents a parameter in one of the three possible callbacks.
+    //
+    // The first letter indicates which position the parameter is in.
+    //
+    // T = A = 1st position
+    // U = B = 2nd position
+    // V = C = 3rd position
+    //
+    // The second letter indicates which whether it is a [R]esolve, Re[J]ect, or [N]otify value.
+    //
+    // The third letter indicates whether the value is returned in the [D]one filter, [F]ail filter, or [P]rogress filter.
     /**
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
@@ -4628,7 +4641,7 @@ declare namespace JQuery {
      */
     interface Promise3<TR, TJ, TN,
         UR, UJ, UN,
-        VR, VJ = any, VN = any> {
+        VR, VJ, VN> {
         /**
          * Add handlers to be called when the Deferred object is either resolved or rejected.
          *
@@ -4693,6 +4706,335 @@ declare namespace JQuery {
          */
         state(): 'pending' | 'resolved' | 'rejected';
 
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never,
+            ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never,
+            ARP = never, AJP = never, ANP = never,
+            BRP = never, BJP = never, BNP = never,
+            CRP = never, CJP = never, CNP = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<AJF> | AJF,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<ARP, AJP, ANP,
+                 BRP, BJP, BNP,
+                 CRP, CJP, CNP> | Thenable<ANP> | ANP): Promise3<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
+            BRD | BRF | BRP, BJD | BJF | BJP, BND | BNF | BNP,
+            CRD | CRF | CRP, CJD | CJF | CJP, CND | CNF | CNP>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never,
+            ARP = never, AJP = never, ANP = never,
+            BRP = never, BJP = never, BNP = never,
+            CRP = never, CJP = never, CNP = never>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<AJF> | AJF,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<ARP, AJP, ANP,
+                 BRP, BJP, BNP,
+                 CRP, CJP, CNP> | Thenable<ANP> | ANP): Promise3<ARF | ARP, AJF | AJP, ANF | ANP,
+            BRF | BRP, BJF | BJP, BNF | BNP,
+            CRF | CRP, CJF | CJP, CNF | CNP>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never,
+            ARP = never, AJP = never, ANP = never,
+            BRP = never, BJP = never, BNP = never,
+            CRP = never, CJP = never, CNP = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<ARP, AJP, ANP,
+                 BRP, BJP, BNP,
+                 CRP, CJP, CNP> | Thenable<ANP> | ANP): Promise3<ARD | ARP, AJD | AJP, AND | ANP,
+            BRD | BRP, BJD | BJP, BND | BNP,
+            CRD | CRP, CJD | CJP, CND | CNP>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never,
+            ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<AJF> | AJF,
+             progressFilter?: null): Promise3<ARD | ARF, AJD | AJF, AND | ANF,
+            BRD | BRF, BJD | BJF, BND | BNF,
+            CRD | CRF, CJD | CJF, CND | CNF>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never,
+            ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<AJF> | AJF,
+             progressFilter?: null): Promise3<ARD | ARF, AJD | AJF, AND | ANF,
+            BRD | BRF, BJD | BJF, BND | BNF,
+            CRD | CRF, CJD | CJF, CND | CNF>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<AJF> | AJF,
+             progressFilter?: null): Promise3<ARF, AJF, ANF,
+            BRF, BJF, BNF,
+            CRF, CJF, CNF>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter?: null,
+             progressFilter?: null): Promise3<ARD, AJD, AND,
+            BRD, BJD, BND,
+            CRD, CJD, CND>;
+
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never,
+            ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never,
+            ARP = never, AJP = never, ANP = never,
+            BRP = never, BJP = never, BNP = never,
+            CRP = never, CJP = never, CNP = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<ARF> | ARF,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<ARP, AJP, ANP,
+                 BRP, BJP, BNP,
+                 CRP, CJP, CNP> | Thenable<ANP> | ANP): Promise3<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
+            BRD | BRF | BRP, BJD | BJF | BJP, BND | BNF | BNP,
+            CRD | CRF | CRP, CJD | CJF | CJP, CND | CNF | CNP>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never,
+            ARP = never, AJP = never, ANP = never,
+            BRP = never, BJP = never, BNP = never,
+            CRP = never, CJP = never, CNP = never>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<ARF> | ARF,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<ARP, AJP, ANP,
+                 BRP, BJP, BNP,
+                 CRP, CJP, CNP> | Thenable<ANP> | ANP): Promise3<ARF | ARP, AJF | AJP, ANF | ANP,
+            BRF | BRP, BJF | BJP, BNF | BNP,
+            CRF | CRP, CJF | CJP, CNF | CNP>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never,
+            ARP = never, AJP = never, ANP = never,
+            BRP = never, BJP = never, BNP = never,
+            CRP = never, CJP = never, CNP = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<ARP, AJP, ANP,
+                 BRP, BJP, BNP,
+                 CRP, CJP, CNP> | Thenable<ANP> | ANP): Promise3<ARD | ARP, AJD | AJP, AND | ANP,
+            BRD | BRP, BJD | BJP, BND | BNP,
+            CRD | CRP, CJD | CJP, CND | CNP>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARP = never, AJP = never, ANP = never,
+            BRP = never, BJP = never, BNP = never,
+            CRP = never, CJP = never, CNP = never>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (t: TN, u: UN, v: VN) => Promise3<ARP, AJP, ANP,
+                 BRP, BJP, BNP,
+                 CRP, CJP, CNP> | Thenable<ANP> | ANP): Promise3<ARP, AJP, ANP,
+            BRP, BJP, BNP,
+            CRP, CJP, CNP>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never,
+            ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<ARF> | ARF,
+             progressFilter?: null): Promise3<ARD | ARF, AJD | AJF, AND | ANF,
+            BRD | BRF, BJD | BJF, BND | BNF,
+            CRD | CRF, CJD | CJF, CND | CNF>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never>
+            (doneFilter: null,
+             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                 BRF, BJF, BNF,
+                 CRF, CJF, CNF> | Thenable<ARF> | ARF,
+             progressFilter?: null): Promise3<ARF, AJF, ANF,
+            BRF, BJF, BNF,
+            CRF, CJF, CNF>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARD = never, AJD = never, AND = never,
+            BRD = never, BJD = never, BND = never,
+            CRD = never, CJD = never, CND = never>
+            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<ARD, AJD, AND,
+                 BRD, BJD, BND,
+                 CRD, CJD, CND> | Thenable<ARD> | ARD,
+             failFilter?: null,
+             progressFilter?: null): Promise3<ARD, AJD, AND,
+            BRD, BJD, BND,
+            CRD, CJD, CND>;
+
         /**
          * Add handlers to be called when the Deferred object is rejected.
          *
@@ -4700,244 +5042,14 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.catch/}
          * @since 3.0
          */
-        catch<AR, AJ = never, AN = TN,
-            BR = never, BJ = never, BN = UN,
-            CR = never, CJ = never, CN = VN>
-            (failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
-
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
-            BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never,
-            CR1 = never, CR2 = never, CR3 = never, CJ1 = never, CJ2 = never, CJ3 = never, CN1 = CN3, CN2 = CN3, CN3 = never>
-            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2,
-             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR3, AJ3, AN3, BR3, BJ3, BN3, CR3, CJ3, CN3> | Thenable<AN3> | AN3): Promise3<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
-            BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3,
-            CR1 | CR2 | CR3, CJ1 | CJ2 | CJ3, CN1 | CN2 | CN3>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
-            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AN1> | AN1): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
-            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
-            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AN1> | AN1): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
-            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR = TJ, AJ = TJ, AN = TN,
-            BR = UJ, BJ = UJ, BN = never,
-            CR = VJ, CJ = VJ, CN = never>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AN> | AN): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN,
-            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = VN, CN2 = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2,
-             progressFilter?: null): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
-            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR, AJ = never, AN = TN,
-            BR = never, BJ = never, BN = UN,
-            CR = never, CJ = never, CN = VN>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR,
-             progressFilter?: null): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR, AJ = TJ, AN = TN,
-            BR = never, BJ = UJ, BN = UN,
-            CR = never, CJ = VJ, CN = VN>
-            (doneFilter: ((t: TR, u: UR, v: VR) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR) | null,
-             failFilter?: null,
-             progressFilter?: null): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
-
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
-            BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never,
-            CR1 = never, CR2 = never, CR3 = never, CJ1 = never, CJ2 = never, CJ3 = never, CN1 = CN3, CN2 = CN3, CN3 = never>
-            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2,
-             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR3, AJ3, AN3, BR3, BJ3, BN3, CR3, CJ3, CN3> | Thenable<AN3> | AN3): Promise3<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
-            BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3,
-            CR1 | CR2 | CR3, CJ1 | CJ2 | CJ3, CN1 | CN2 | CN3>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
-            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AN1> | AN1): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
-            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN,
-            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = CN2, CN2 = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AN1> | AN1): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
-            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR = TJ, AJ = TJ, AN = TN,
-            BR = UJ, BJ = UJ, BN = never,
-            CR = VJ, CJ = VJ, CN = never>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AN> | AN): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN,
-            CR1 = never, CR2 = never, CJ1 = never, CJ2 = never, CN1 = VN, CN2 = VN>
-            (doneFilter: (t: TR, u: UR, v: VR) => Promise3<AR1, AJ1, AN1, BR1, BJ1, BN1, CR1, CJ1, CN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR2, AJ2, AN2, BR2, BJ2, BN2, CR2, CJ2, CN2> | Thenable<AR2> | AR2,
-             progressFilter?: null): Promise3<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2,
-            CR1 | CR2, CJ1 | CJ2, CN1 | CN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR, AJ = never, AN = TN,
-            BR = never, BJ = never, BN = UN,
-            CR = never, CJ = never, CN = VN>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR,
-             progressFilter?: null): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR, AJ = TJ, AN = TN,
-            BR = never, BJ = UJ, BN = UN,
-            CR = never, CJ = VJ, CN = VN>
-            (doneFilter: ((t: TR, u: UR, v: VR) => Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN> | Thenable<AR> | AR) | null,
-             failFilter?: null,
-             progressFilter?: null): Promise3<AR, AJ, AN, BR, BJ, BN, CR, CJ, CN>;
+        catch<ARF = never, AJF = never, ANF = never,
+            BRF = never, BJF = never, BNF = never,
+            CRF = never, CJF = never, CNF = never>
+            (failFilter: (t: TJ, u: UJ, v: VJ) => Promise3<ARF, AJF, ANF,
+                BRF, BJF, BNF,
+                CRF, CJF, CNF> | Thenable<ARF> | ARF): Promise3<ARF, AJF, ANF,
+            BRF, BJF, BNF,
+            CRF, CJF, CNF>;
     }
 
     /**
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 7b0c521b88..93a147bbfe 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -1,3 +1,5 @@
+// tslint:disable:interface-name
+
 function JQuery() {
     function type_assertion() {
         const $el = $(document.createElement('canvas'));
@@ -4586,40 +4588,25 @@ function JQueryStatic() {
                 const w = $.when(t, u, v);
 
                 w.then((a, b, c) => {
-                    // $ExpectType string
-                    a[0];
-                    // $ExpectType boolean
-                    a[1];
-                    // $ExpectType string
-                    b[0];
-                    // $ExpectType boolean
-                    b[1];
-                    // $ExpectType string
-                    c[0];
-                    // $ExpectType boolean
-                    c[1];
+                    a[0]; // $ExpectType string
+                    a[1]; // $ExpectType boolean
+                    b[0]; // $ExpectType string
+                    b[1]; // $ExpectType boolean
+                    c[0]; // $ExpectType string
+                    c[1]; // $ExpectType boolean
                 });
                 w.catch((a, b, c) => {
-                    // $ExpectType Error
-                    a[0];
-                    // $ExpectType any
-                    a[1];
-                    // $ExpectType Error
-                    b[0];
-                    // $ExpectType any
-                    b[1];
-                    // $ExpectType Error
-                    c[0];
-                    // $ExpectType any
-                    c[1];
+                    a[0]; // $ExpectType Error
+                    a[1]; // $ExpectType any
+                    b[0]; // $ExpectType Error
+                    b[1]; // $ExpectType any
+                    c[0]; // $ExpectType Error
+                    c[1]; // $ExpectType any
                 });
                 w.then(null, null, (a, b, c) => {
-                    // $ExpectType never
-                    a;
-                    // $ExpectType never
-                    b;
-                    // $ExpectType never
-                    c;
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
                 });
             }
 
@@ -4628,30 +4615,20 @@ function JQueryStatic() {
                 const w = $.when(t, u);
 
                 w.then((a, b) => {
-                    // $ExpectType string
-                    a[0];
-                    // $ExpectType boolean
-                    a[1];
-                    // $ExpectType string
-                    b[0];
-                    // $ExpectType boolean
-                    b[1];
+                    a[0]; // $ExpectType string
+                    a[1]; // $ExpectType boolean
+                    b[0]; // $ExpectType string
+                    b[1]; // $ExpectType boolean
                 });
                 w.catch((a, b) => {
-                    // $ExpectType Error
-                    a[0];
-                    // $ExpectType any
-                    a[1];
-                    // $ExpectType Error
-                    b[0];
-                    // $ExpectType any
-                    b[1];
+                    a[0]; // $ExpectType Error
+                    a[1]; // $ExpectType any
+                    b[0]; // $ExpectType Error
+                    b[1]; // $ExpectType any
                 });
                 w.then(null, null, (a, b) => {
-                    // $ExpectType never
-                    a;
-                    // $ExpectType never
-                    b;
+                    a; // $ExpectType never
+                    b; // $ExpectType never
                 });
             }
 
@@ -4660,22 +4637,16 @@ function JQueryStatic() {
                 const w = $.when(t);
 
                 w.then((a, b) => {
-                    // $ExpectType string
-                    a;
-                    // $ExpectType boolean
-                    b;
+                    a; // $ExpectType string
+                    b; // $ExpectType boolean
                 });
                 w.catch((a, b) => {
-                    // $ExpectType Error
-                    a;
-                    // $ExpectType any
-                    b;
+                    a; // $ExpectType Error
+                    b; // $ExpectType any
                 });
                 w.then(null, null, (a, b) => {
-                    // $ExpectType never
-                    a;
-                    // $ExpectType never
-                    b;
+                    a; // $ExpectType never
+                    b; // $ExpectType never
                 });
             }
         }
@@ -5400,7 +5371,26 @@ function jqXHR() {
     }
 }
 
-function Promise3(p: JQuery.Promise3<string, Error, number, JQuery, string, boolean, any, Function, never>) {
+function Promise3() {
+    interface I1 { kind: 'I1'; }
+    interface I2 { kind: 'I2'; }
+    interface I3 { kind: 'I3'; }
+    interface I4 { kind: 'I4'; }
+    interface I5 { kind: 'I5'; }
+    interface I6 { kind: 'I6'; }
+    interface I7 { kind: 'I7'; }
+    interface I8 { kind: 'I8'; }
+    interface I9 { kind: 'I9'; }
+
+    const p: JQuery.Promise3<string, Error, number, JQuery, string, boolean, any, Function, never> = {} as any;
+    const p1: JQuery.Promise3<I1, I2, I3, I4, I5, I6, I7, I8, I9> = {} as any;
+    const p2: JQuery.Promise3<I2, I3, I4, I5, I6, I7, I8, I9, I1> = {} as any;
+    const p3: JQuery.Promise3<I3, I4, I5, I6, I7, I8, I9, I1, I2> = {} as any;
+
+    const t1: JQuery.Thenable<I1> = {} as any;
+    const t2: JQuery.Thenable<I2> = {} as any;
+    const t3: JQuery.Thenable<I3> = {} as any;
+
     function then() {
         p.then((a, b, c) => {
             a; // $ExpectType string
@@ -5450,7 +5440,7 @@ function Promise3(p: JQuery.Promise3<string, Error, number, JQuery, string, bool
             a; // $ExpectType Error
             b; // $ExpectType string
             c; // $ExpectType Function
-        });
+        }, null);
 
         p.then((a, b, c) => {
             a; // $ExpectType string
@@ -5460,12 +5450,6 @@ function Promise3(p: JQuery.Promise3<string, Error, number, JQuery, string, bool
             a; // $ExpectType Error
             b; // $ExpectType string
             c; // $ExpectType Function
-        }, null);
-
-        p.then(null, (a, b, c) => {
-            a; // $ExpectType Error
-            b; // $ExpectType string
-            c; // $ExpectType Function
         });
 
         p.then(null, (a, b, c) => {
@@ -5474,29 +5458,29 @@ function Promise3(p: JQuery.Promise3<string, Error, number, JQuery, string, bool
             c; // $ExpectType Function
         }, null);
 
-        p.then((a, b, c) => {
-            a; // $ExpectType string
-            b; // $ExpectType JQuery<HTMLElement>
-            c; // $ExpectType any
+        p.then(null, (a, b, c) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
+            c; // $ExpectType Function
         });
 
-        p.then((a, b, c) => {
-            a; // $ExpectType string
-            b; // $ExpectType JQuery<HTMLElement>
-            c; // $ExpectType any
-        }, null);
-
         p.then((a, b, c) => {
             a; // $ExpectType string
             b; // $ExpectType JQuery<HTMLElement>
             c; // $ExpectType any
         }, null, null);
 
-        p.then(null);
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        }, null);
 
-        p.then(null, null);
-
-        p.then(null, null, null);
+        p.then((a, b, c) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+            c; // $ExpectType any
+        });
 
         function doneFilter() {
             p.then(() => {
@@ -5559,48 +5543,196 @@ function Promise3(p: JQuery.Promise3<string, Error, number, JQuery, string, bool
         }
 
         function doneFilter_failFilter() {
-            const value = () => {
-                return 1;
-            };
-            const thenable = () => {
-                const t: JQuery.Thenable<string> = {
-                    then() {
-                        return Promise.resolve('myValue');
-                    }
-                };
+            // (value, value)
+            {
+                const q = p.then(() => {
+                    return 1;
+                }, () => {
+                    return 1;
+                });
 
-                return t;
-            };
-            const promise3 = () => {
-                return $.ajax('/echo/json') as JQuery.jqXHR<boolean>;
-            };
+                q.then((a) => {
+                    a; // $ExpectType number
+                }, (a) => {
+                    a; // $ExpectType never
+                }, (a, b, c) => {
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
+                });
+            }
 
-            // $ExpectType Promise3<number, never, never, never, never, never, never, never, never>
-            $.ajax('/echo/json').then(value, value);
+            // (Thenable, Thenable)
+            {
+                const q = p.then(() => {
+                    return t1;
+                }, () => {
+                    return t2;
+                });
 
-            // $ExpectType Promise3<string, never, never, never, never, never, never, never, never>
-            $.ajax('/echo/json').then(thenable, thenable);
+                q.then((a) => {
+                    a; // $ExpectType I1 | I2
+                }, (a) => {
+                    a; // $ExpectType never
+                }, (a, b, c) => {
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
+                });
+            }
 
-            // $ExpectType Promise3<boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
-            $.ajax('/echo/json').then(promise3, promise3);
+            // (Promise3, Promise3)
+            {
+                const q = p.then(() => {
+                    return p1;
+                }, () => {
+                    return p2;
+                });
 
-            // $ExpectType Promise3<string | number, never, never, never, never, never, never, never, never>
-            $.ajax('/echo/json').then(value, thenable);
+                q.then((a, b, c) => {
+                    a; // $ExpectType I1 | I2
+                    b; // $ExpectType I4 | I5
+                    c; // $ExpectType I7 | I8
+                }, (a, b, c) => {
+                    a; // $ExpectType I2 | I3
+                    b; // $ExpectType I5 | I6
+                    c; // $ExpectType I8 | I9
+                }, (a, b, c) => {
+                    a; // $ExpectType I3 | I4
+                    b; // $ExpectType I6 | I7
+                    c; // $ExpectType I1 | I9
+                });
+            }
 
-            // $ExpectType Promise3<string | number, never, never, never, never, never, never, never, never>
-            $.ajax('/echo/json').then(thenable, value);
+            // (value, Thenable)
+            {
+                const q = p.then(() => {
+                    return 1;
+                }, () => {
+                    return t1;
+                });
 
-            // $ExpectType Promise3<number | boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
-            $.ajax('/echo/json').then(value, promise3);
+                q.then((a) => {
+                    a; // $ExpectType number | I1
+                }, (a) => {
+                    a; // never
+                }, (a, b, c) => {
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
+                });
+            }
 
-            // $ExpectType Promise3<number | boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
-            $.ajax('/echo/json').then(promise3, value);
+            // (Thenable, value)
+            {
+                const q = p.then(() => {
+                    return t1;
+                }, () => {
+                    return 1;
+                });
 
-            // $ExpectType Promise3<string | boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
-            $.ajax('/echo/json').then(thenable, promise3);
+                q.then((a) => {
+                    a; // $ExpectType number | I1
+                }, (a) => {
+                    a; // never
+                }, (a, b, c) => {
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
+                });
+            }
 
-            // $ExpectType Promise3<string | boolean, jqXHR<boolean>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<boolean>, string, never>
-            $.ajax('/echo/json').then(promise3, thenable);
+            // (value, Promise3)
+            {
+                const q = p.then(() => {
+                    return 1;
+                }, () => {
+                    return p1;
+                });
+
+                q.then((a, b, c) => {
+                    a; // $ExpectType number | I1
+                    b; // $ExpectType I4
+                    c; // $ExpectType I7
+                }, (a, b, c) => {
+                    a; // $ExpectType I2
+                    b; // $ExpectType I5
+                    c; // $ExpectType I8
+                }, (a, b, c) => {
+                    a; // $ExpectType I3
+                    b; // $ExpectType I6
+                    c; // $ExpectType I9
+                });
+            }
+
+            // (Promise3, value)
+            {
+                const q = p.then(() => {
+                    return p1;
+                }, () => {
+                    return 1;
+                });
+
+                q.then((a, b, c) => {
+                    a; // $ExpectType number | I1
+                    b; // $ExpectType I4
+                    c; // $ExpectType I7
+                }, (a, b, c) => {
+                    a; // $ExpectType I2
+                    b; // $ExpectType I5
+                    c; // $ExpectType I8
+                }, (a, b, c) => {
+                    a; // $ExpectType I3
+                    b; // $ExpectType I6
+                    c; // $ExpectType I9
+                });
+            }
+
+            // (Thenable, Promise3)
+            {
+                const q = p.then(() => {
+                    return t1;
+                }, () => {
+                    return p2;
+                });
+
+                q.then((a, b, c) => {
+                    a; // $ExpectType I1 | I2
+                    b; // $ExpectType I5
+                    c; // $ExpectType I8
+                }, (a, b, c) => {
+                    a; // $ExpectType I3
+                    b; // $ExpectType I6
+                    c; // $ExpectType I9
+                }, (a, b, c) => {
+                    a; // $ExpectType I4
+                    b; // $ExpectType I7
+                    c; // $ExpectType I1
+                });
+            }
+
+            // (Promise3, Thenable)
+            {
+                const q = p.then(() => {
+                    return p1;
+                }, () => {
+                    return t2;
+                });
+
+                q.then((a, b, c) => {
+                    a; // $ExpectType I1 | I2
+                    b; // $ExpectType I4
+                    c; // $ExpectType I7
+                }, (a, b, c) => {
+                    a; // $ExpectType I2
+                    b; // $ExpectType I5
+                    c; // $ExpectType I8
+                }, (a, b, c) => {
+                    a; // $ExpectType I3
+                    b; // $ExpectType I6
+                    c; // $ExpectType I9
+                });
+            }
         }
     }
 

From d03b2b9ad5df3aecbead6a5ba573e0b1015d7486 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Tue, 27 Jun 2017 17:57:35 -0400
Subject: [PATCH 090/287] [jquery] Change Promise2 to extend from Promise3.

---
 types/jquery/index.d.ts      | 295 +----------------------------------
 types/jquery/jquery-tests.ts |  41 ++---
 2 files changed, 18 insertions(+), 318 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index e92560017d..862cd57e4a 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4591,10 +4591,6 @@ declare namespace JQuery {
             (t: T, u: U, v: V): void;
         }
 
-        interface Callback2<T, U> {
-            (t: T, u: U): void;
-        }
-
         interface Callback<T> {
             (...args: T[]): void;
         }
@@ -5059,294 +5055,9 @@ declare namespace JQuery {
      * @see {@link http://api.jquery.com/Types/#Promise}
      */
     interface Promise2<TR, TJ, TN,
-        UR, UJ = any, UN = any> {
-        /**
-         * Add handlers to be called when the Deferred object is either resolved or rejected.
-         *
-         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
-         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-         * @see {@link https://api.jquery.com/deferred.always/}
-         * @since 1.6
-         */
-        always(alwaysCallback: TypeOrArray<Deferred.Callback2<TR | TJ, UR | UJ>>,
-               ...alwaysCallbacks: Array<TypeOrArray<Deferred.Callback2<TR | TJ, UR | UJ>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object is resolved.
-         *
-         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
-         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.done/}
-         * @since 1.5
-         */
-        done(doneCallback: TypeOrArray<Deferred.Callback2<TR, UR>>,
-             ...doneCallbacks: Array<TypeOrArray<Deferred.Callback2<TR, UR>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object is rejected.
-         *
-         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
-         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.fail/}
-         * @since 1.5
-         */
-        fail(failCallback: TypeOrArray<Deferred.Callback2<TJ, UJ>>,
-             ...failCallbacks: Array<TypeOrArray<Deferred.Callback2<TJ, UJ>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object generates progress notifications.
-         *
-         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
-         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
-         *                          progress notifications.
-         * @see {@link https://api.jquery.com/deferred.progress/}
-         * @since 1.7
-         */
-        progress(progressCallback: TypeOrArray<Deferred.Callback2<TN, UN>>,
-                 ...progressCallbacks: Array<TypeOrArray<Deferred.Callback2<TN, UN>>>): this;
-        /**
-         * Return a Deferred's Promise object.
-         *
-         * @param target Object onto which the promise methods have to be attached
-         * @see {@link https://api.jquery.com/deferred.promise/}
-         * @since 1.5
-         */
-        promise<TTarget extends object>(target: TTarget): this & TTarget;
-        /**
-         * Return a Deferred's Promise object.
-         *
-         * @see {@link https://api.jquery.com/deferred.promise/}
-         * @since 1.5
-         */
-        promise(): this;
-        /**
-         * Determine the current state of a Deferred object.
-         *
-         * @see {@link https://api.jquery.com/deferred.state/}
-         * @since 1.7
-         */
-        state(): 'pending' | 'resolved' | 'rejected';
-
-        /**
-         * Add handlers to be called when the Deferred object is rejected.
-         *
-         * @param failFilter A function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.catch/}
-         * @since 3.0
-         */
-        catch<AR, AJ = never, AN = TN,
-            BR = never, BJ = never, BN = UN>
-            (failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR): Promise2<AR, AJ, AN, BR, BJ, BN>;
-
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
-            BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never>
-            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2,
-             progressFilter: (t: TN, u: UN) => Promise2<AR3, AJ3, AN3, BR3, BJ3, BN3> | Thenable<AN3> | AN3): Promise2<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
-            BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             progressFilter: (t: TN, u: UN) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AN1> | AN1): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
-            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AN1> | AN1): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR = TJ, AJ = TJ, AN = TN,
-            BR = UJ, BJ = UJ, BN = never>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AN> | AN): Promise2<AR, AJ, AN, BR, BJ, BN>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN>
-            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2,
-             progressFilter?: null): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR, AJ = never, AN = TN,
-            BR = never, BJ = never, BN = UN>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR,
-             progressFilter?: null): Promise2<AR, AJ, AN, BR, BJ, BN>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR, AJ = TJ, AN = TN,
-            BR = never, BJ = UJ, BN = UN>
-            (doneFilter: ((t: TR, u: UR) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR) | null,
-             failFilter?: null,
-             progressFilter?: null): Promise2<AR, AJ, AN, BR, BJ, BN>;
-
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN,
-            BR1 = never, BR2 = never, BR3 = never, BJ1 = never, BJ2 = never, BJ3 = never, BN1 = BN3, BN2 = BN3, BN3 = never>
-            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2,
-             progressFilter: (t: TN, u: UN) => Promise2<AR3, AJ3, AN3, BR3, BJ3, BN3> | Thenable<AN3> | AN3): Promise2<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3,
-            BR1 | BR2 | BR3, BJ1 | BJ2 | BJ3, BN1 | BN2 | BN3>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             progressFilter: (t: TN, u: UN) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AN1> | AN1): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = BN2, BN2 = UN>
-            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AN1> | AN1): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR = TJ, AJ = TJ, AN = TN,
-            BR = UJ, BJ = UJ, BN = never>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AN> | AN): Promise2<AR, AJ, AN, BR, BJ, BN>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN,
-            BR1 = never, BR2 = never, BJ1 = never, BJ2 = never, BN1 = UN, BN2 = UN>
-            (doneFilter: (t: TR, u: UR) => Promise2<AR1, AJ1, AN1, BR1, BJ1, BN1> | Thenable<AR1> | AR1,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR2, AJ2, AN2, BR2, BJ2, BN2> | Thenable<AR2> | AR2,
-             progressFilter?: null): Promise2<AR1 | AR2, AJ1 | AJ2, AN1 | AN2,
-            BR1 | BR2, BJ1 | BJ2, BN1 | BN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR, AJ = never, AN = TN,
-            BR = never, BJ = never, BN = UN>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR,
-             progressFilter?: null): Promise2<AR, AJ, AN, BR, BJ, BN>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR, AJ = TJ, AN = TN,
-            BR = never, BJ = UJ, BN = UN>
-            (doneFilter: ((t: TR, u: UR) => Promise2<AR, AJ, AN, BR, BJ, BN> | Thenable<AR> | AR) | null,
-             failFilter?: null,
-             progressFilter?: null): Promise2<AR, AJ, AN, BR, BJ, BN>;
-    }
+        UR, UJ, UN> extends Promise3<TR, TJ, TN,
+        UR, UJ, UN,
+        never, never, never> { }
 
     /**
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 93a147bbfe..7347a8a415 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4579,9 +4579,9 @@ function JQueryStatic() {
         }
 
         function Promise2() {
-            const t = $.Deferred() as JQuery.Promise2<string, Error, number, boolean>;
-            const u = $.Deferred() as JQuery.Promise2<string, Error, number, boolean>;
-            const v = $.Deferred() as JQuery.Promise2<string, Error, number, boolean>;
+            const t = $.Deferred() as JQuery.Promise2<string, Error, number, boolean, any, any>;
+            const u = $.Deferred() as JQuery.Promise2<string, Error, number, boolean, any, any>;
+            const v = $.Deferred() as JQuery.Promise2<string, Error, number, boolean, any, any>;
 
             // 3 parameters
             {
@@ -5364,11 +5364,6 @@ function jqXHR() {
             errorThrown;
         });
     }
-
-    function then_returnType() {
-        // $ExpectType Promise3<void, jqXHR<any>, never, never, ErrorTextStatus, never, never, string, never>
-        $.ajax('/echo/json').then(() => { });
-    }
 }
 
 function Promise3() {
@@ -5800,7 +5795,7 @@ function Promise2(p: JQuery.Promise2<string, Error, number, JQuery, string, bool
         }, (a, b) => {
             a; // $ExpectType Error
             b; // $ExpectType string
-        });
+        }, null);
 
         p.then((a, b) => {
             a; // $ExpectType string
@@ -5808,11 +5803,6 @@ function Promise2(p: JQuery.Promise2<string, Error, number, JQuery, string, bool
         }, (a, b) => {
             a; // $ExpectType Error
             b; // $ExpectType string
-        }, null);
-
-        p.then(null, (a, b) => {
-            a; // $ExpectType Error
-            b; // $ExpectType string
         });
 
         p.then(null, (a, b) => {
@@ -5820,26 +5810,25 @@ function Promise2(p: JQuery.Promise2<string, Error, number, JQuery, string, bool
             b; // $ExpectType string
         }, null);
 
-        p.then((a, b) => {
-            a; // $ExpectType string
-            b; // $ExpectType JQuery<HTMLElement>
+        p.then(null, (a, b) => {
+            a; // $ExpectType Error
+            b; // $ExpectType string
         });
 
-        p.then((a, b) => {
-            a; // $ExpectType string
-            b; // $ExpectType JQuery<HTMLElement>
-        }, null);
-
         p.then((a, b) => {
             a; // $ExpectType string
             b; // $ExpectType JQuery<HTMLElement>
         }, null, null);
 
-        p.then(null);
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        }, null);
 
-        p.then(null, null);
-
-        p.then(null, null, null);
+        p.then((a, b) => {
+            a; // $ExpectType string
+            b; // $ExpectType JQuery<HTMLElement>
+        });
 
         function doneFilter() {
             p.then(() => {

From d8b5452ec029053a3c1ed79cb8c15625d251bc51 Mon Sep 17 00:00:00 2001
From: benbayard <bjbayard@gmail.com>
Date: Tue, 27 Jun 2017 15:01:43 -0700
Subject: [PATCH 091/287] Remove render declaration.

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

diff --git a/types/react-dropzone/index.d.ts b/types/react-dropzone/index.d.ts
index 94c6fc94b1..1ef7932e0d 100644
--- a/types/react-dropzone/index.d.ts
+++ b/types/react-dropzone/index.d.ts
@@ -41,7 +41,6 @@ declare module "react-dropzone" {
 
     export declare class Dropzone extends React.Component<DropzoneProps, never> {
         open(): void;
-        render(): JSX.Element;
     }
     export = Dropzone;
 }

From a2b40c9f1074150eccdbe6c40a98d7cf13fa0e14 Mon Sep 17 00:00:00 2001
From: codemannz <codeman_nz@hotmail.com>
Date: Wed, 28 Jun 2017 10:15:18 +1200
Subject: [PATCH 092/287] Added View variable type

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

diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index d8ced49217..52d8c7a492 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -1272,7 +1272,7 @@ declare namespace Marionette {
         getRegion(): Region;
 
         /** Show a view in the root region */
-        showView(view: any): void;
+        showView(view: View): void;
 
         /** Get the view from the root region*/
         getView(): any;

From c735b73233baab5e9ff3b0e30ca5c644c9aec0b4 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Tue, 27 Jun 2017 18:16:04 -0400
Subject: [PATCH 093/287] [jquery] Fix Promise and Deferred. Fix when()
 ordering.

---
 types/jquery/index.d.ts      | 851 +++++++++++++----------------------
 types/jquery/jquery-tests.ts |  39 +-
 2 files changed, 319 insertions(+), 571 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 862cd57e4a..658a463c83 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3267,20 +3267,6 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @since 1.12-2.2
      */
     uniqueSort<T extends Element>(array: T[]): T[];
-    /**
-     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
-     * Deferred objects that represent asynchronous events.
-     *
-     * @see {@link https://api.jquery.com/jQuery.when/}
-     * @since 1.5
-     */
-    when<TR1, UR1, VR1,
-        TJ1 = any, UJ1 = any, VJ1 = any>
-        (deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1,
-         deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1,
-         deferredV: JQuery.Promise<VR1, VJ1, any> | JQuery.Thenable<VR1> | VR1): JQuery.Promise3<TR1, TJ1, never,
-        UR1, UJ1, never,
-        VR1, VJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3312,11 +3298,13 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, UR1,
-        TJ1 = any, UJ1 = any>
+    when<TR1, UR1, VR1,
+        TJ1 = any, UJ1 = any, VJ1 = any>
         (deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1,
-         deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1): JQuery.Promise2<TR1, TJ1, never,
-        UR1, UJ1, never>;
+         deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1,
+         deferredV: JQuery.Promise<VR1, VJ1, any> | JQuery.Thenable<VR1> | VR1): JQuery.Promise3<TR1, TJ1, never,
+        UR1, UJ1, never,
+        VR1, VJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3342,7 +3330,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1 = any>(deferred: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1): JQuery.Promise<TR1, TJ1, never>;
+    when<TR1, UR1,
+        TJ1 = any, UJ1 = any>
+        (deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1,
+         deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1): JQuery.Promise2<TR1, TJ1, never,
+        UR1, UJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3355,6 +3347,14 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
         TR3 = never, TJ3 = never>
         (deferredT: JQuery.Promise3<TR1, TJ1, any, TR2, TJ2, any, TR3, TJ3, any> |
             JQuery.Promise2<TR1, TJ1, any, TR2, TJ2, any>): JQuery.Promise3<TR1, TJ1, never, TR2, TJ2, never, TR3, TJ3, never>;
+    /**
+     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
+     * Deferred objects that represent asynchronous events.
+     *
+     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @since 1.5
+     */
+    when<TR1, TJ1 = any>(deferred: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1): JQuery.Promise<TR1, TJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -4271,351 +4271,6 @@ declare namespace JQuery {
      */
     interface Thenable<T> extends PromiseLike<T> { }
 
-    interface DeferredStatic {
-        // https://jquery.com/upgrade-guide/3.0/#callback-exit
-        exceptionHook: any;
-        <TR = any, TJ = any, TN = any>(beforeStart?: (this: JQuery.Deferred<TR, TJ, TN>, deferred: JQuery.Deferred<TR, TJ, TN>) => void): JQuery.Deferred<TR, TJ, TN>;
-    }
-
-    interface Deferred<TR, TJ = any, TN = any> {
-        /**
-         * Add handlers to be called when the Deferred object is either resolved or rejected.
-         *
-         * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
-         * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-         * @see {@link https://api.jquery.com/deferred.always/}
-         * @since 1.6
-         */
-        always(alwaysCallback: TypeOrArray<Deferred.AlwaysCallback<TR, TJ>>,
-               ...alwaysCallbacks: Array<TypeOrArray<Deferred.AlwaysCallback<TR, TJ>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object is resolved.
-         *
-         * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
-         * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.done/}
-         * @since 1.5
-         */
-        done(doneCallback: TypeOrArray<Deferred.DoneCallback<TR>>,
-             ...doneCallbacks: Array<TypeOrArray<Deferred.DoneCallback<TR>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object is rejected.
-         *
-         * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
-         * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.fail/}
-         * @since 1.5
-         */
-        fail(failCallback: TypeOrArray<Deferred.FailCallback<TJ>>,
-             ...failCallbacks: Array<TypeOrArray<Deferred.FailCallback<TJ>>>): this;
-        /**
-         * Add handlers to be called when the Deferred object generates progress notifications.
-         *
-         * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
-         * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
-         *                          progress notifications.
-         * @see {@link https://api.jquery.com/deferred.progress/}
-         * @since 1.7
-         */
-        progress(progressCallback: TypeOrArray<Deferred.ProgressCallback<TN>>,
-                 ...progressCallbacks: Array<TypeOrArray<Deferred.ProgressCallback<TN>>>): this;
-        /**
-         * Return a Deferred's Promise object.
-         *
-         * @param target Object onto which the promise methods have to be attached
-         * @see {@link https://api.jquery.com/deferred.promise/}
-         * @since 1.5
-         */
-        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TR, TJ, TN> & TTarget;
-        /**
-         * Return a Deferred's Promise object.
-         *
-         * @see {@link https://api.jquery.com/deferred.promise/}
-         * @since 1.5
-         */
-        promise(): JQuery.Promise<TR, TJ, TN>;
-        /**
-         * Determine the current state of a Deferred object.
-         *
-         * @see {@link https://api.jquery.com/deferred.state/}
-         * @since 1.7
-         */
-        state(): 'pending' | 'resolved' | 'rejected';
-
-        /**
-         * Add handlers to be called when the Deferred object is rejected.
-         *
-         * @param failFilter A function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.catch/}
-         * @since 3.0
-         */
-        catch<AR, AJ = never, AN = TN>(failFilter: (...reasons: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
-
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR3, AJ3, AN3> | Thenable<AN3> | AN3): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR = TJ, AJ = TJ, AN = TN>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AN> | AN): JQuery.Promise<AR, AJ, AN>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR, AJ = never, AN = TN>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR, AJ = TJ, AN = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
-
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR3, AJ3, AN3> | Thenable<AN3> | AN3): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR = TJ, AJ = TJ, AN = TN>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AN> | AN): JQuery.Promise<AR, AJ, AN>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR, AJ = never, AN = TN>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR, AJ = TJ, AN = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
-
-        /**
-         * Call the progressCallbacks on a Deferred object with the given args.
-         *
-         * @param args Optional arguments that are passed to the progressCallbacks.
-         * @see {@link https://api.jquery.com/deferred.notify/}
-         * @since 1.7
-         */
-        notify(...args: TN[]): this;
-        /**
-         * Call the progressCallbacks on a Deferred object with the given context and args.
-         *
-         * @param context Context passed to the progressCallbacks as the this object.
-         * @param args An optional array of arguments that are passed to the progressCallbacks.
-         * @see {@link https://api.jquery.com/deferred.notifyWith/}
-         * @since 1.7
-         */
-        notifyWith(context: object, args?: ArrayLike<TN>): this;
-        /**
-         * Reject a Deferred object and call any failCallbacks with the given args.
-         *
-         * @param args Optional arguments that are passed to the failCallbacks.
-         * @see {@link https://api.jquery.com/deferred.reject/}
-         * @since 1.5
-         */
-        reject(...args: TJ[]): this;
-        /**
-         * Reject a Deferred object and call any failCallbacks with the given context and args.
-         *
-         * @param context Context passed to the failCallbacks as the this object.
-         * @param args An optional array of arguments that are passed to the failCallbacks.
-         * @see {@link https://api.jquery.com/deferred.rejectWith/}
-         * @since 1.5
-         */
-        rejectWith(context: object, args?: ArrayLike<TJ>): this;
-        /**
-         * Resolve a Deferred object and call any doneCallbacks with the given args.
-         *
-         * @param args Optional arguments that are passed to the doneCallbacks.
-         * @see {@link https://api.jquery.com/deferred.resolve/}
-         * @since 1.5
-         */
-        resolve(...args: TR[]): this;
-        /**
-         * Resolve a Deferred object and call any doneCallbacks with the given context and args.
-         *
-         * @param context Context passed to the doneCallbacks as the this object.
-         * @param args An optional array of arguments that are passed to the doneCallbacks.
-         * @see {@link https://api.jquery.com/deferred.resolveWith/}
-         * @since 1.5
-         */
-        resolveWith(context: object, args?: ArrayLike<TR>): this;
-    }
-
-    namespace Deferred {
-        interface Callback3<T, U, V> {
-            (t: T, u: U, v: V): void;
-        }
-
-        interface Callback<T> {
-            (...args: T[]): void;
-        }
-
-        /**
-         * @deprecated
-         */
-        interface DoneCallback<TResolve> extends Callback<TResolve> { }
-
-        /**
-         * @deprecated
-         */
-        interface FailCallback<TReject> extends Callback<TReject> { }
-
-        /**
-         * @deprecated
-         */
-        interface AlwaysCallback<TResolve, TReject> extends Callback<TResolve | TReject> { }
-
-        /**
-         * @deprecated
-         */
-        interface ProgressCallback<TNotify> extends Callback<TNotify> { }
-    }
-
     // Type parameter guide
     // --------------------
     // Each type parameter represents a parameter in one of the three possible callbacks.
@@ -5114,14 +4769,14 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.promise/}
          * @since 1.5
          */
-        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TR> & TTarget;
+        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TR, TJ, TN> & TTarget;
         /**
          * Return a Deferred's Promise object.
          *
          * @see {@link https://api.jquery.com/deferred.promise/}
          * @since 1.5
          */
-        promise(): JQuery.Promise<TR>;
+        promise(): JQuery.Promise<TR, TJ, TN>;
         /**
          * Determine the current state of a Deferred object.
          *
@@ -5130,6 +4785,207 @@ declare namespace JQuery {
          */
         state(): 'pending' | 'resolved' | 'rejected';
 
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never,
+            ARF = never, AJF = never, ANF = never,
+            ARP = never, AJP = never, ANP = never>
+            (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
+             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
+             progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARF = never, AJF = never, ANF = never,
+            ARP = never, AJP = never, ANP = never>
+            (doneFilter: null,
+             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
+             progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARF | ARP, AJF | AJP, ANF | ANP>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never,
+            ARP = never, AJP = never, ANP = never>
+            (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARD | ARP, AJD | AJP, AND | ANP>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARF = never, AJF = never, ANF = never,
+            ARP = never, AJP = never, ANP = never>
+            (doneFilter: null,
+             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
+             progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARF | ARP, AJF | AJP, ANF | ANP>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never,
+            ARF = never, AJF = never, ANF = never>
+            (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
+             failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
+             progressFilter?: null): Promise<ARD | ARF, AJD | AJF, AND | ANF>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARF = never, AJF = never, ANF = never>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
+             progressFilter?: null): Promise<ARF, AJF, ANF>;
+        /**
+         * Utility method to filter and/or chain Deferreds.
+         *
+         * @param doneFilter An optional function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @since 1.6
+         * @since 1.7
+         * @deprecated 1.8
+         */
+        pipe<ARD = never, AJD = never, AND = never>
+            (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
+             failFilter?: null,
+             progressFilter?: null): Promise<ARD, AJD, AND>;
+
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARD = never, AJD = never, AND = never,
+            ARF = never, AJF = never, ANF = never,
+            ARP = never, AJP = never, ANP = never>
+            (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
+             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF,
+             progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARF = never, AJF = never, ANF = never,
+            ARP = never, AJP = never, ANP = never>
+            (doneFilter: null,
+             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF,
+             progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARF | ARP, AJF | AJP, ANF | ANP>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARD = never, AJD = never, AND = never,
+            ARP = never, AJP = never, ANP = never>
+            (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARD | ARP, AJD | AJP, AND | ANP>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARP = never, AJP = never, ANP = never>
+            (doneFilter: null,
+             failFilter: null,
+             progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARP, AJP, ANP>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARD = never, AJD = never, AND = never,
+            ARF = never, AJF = never, ANF = never>
+            (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
+             failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF,
+             progressFilter?: null): Promise<ARD | ARF, AJD | AJF, AND | ANF>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @param failFilter An optional function that is called when the Deferred is rejected.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARF = never, AJF = never, ANF = never>
+            (doneFilter: null,
+             failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF,
+             progressFilter?: null): Promise<ARF, AJF, ANF>;
+        /**
+         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
+         *
+         * @param doneFilter A function that is called when the Deferred is resolved.
+         * @see {@link https://api.jquery.com/deferred.then/}
+         * @since 1.8
+         */
+        then<ARD = never, AJD = never, AND = never>
+            (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
+             failFilter?: null,
+             progressFilter?: null): Promise<ARD, AJD, AND>;
+
         /**
          * Add handlers to be called when the Deferred object is rejected.
          *
@@ -5137,197 +4993,98 @@ declare namespace JQuery {
          * @see {@link https://api.jquery.com/deferred.catch/}
          * @since 3.0
          */
-        catch<AR, AJ = never, AN = TN>(failFilter: (...reasons: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR): JQuery.Promise<AR, AJ, AN>;
+        catch<ARF = never, AJF = never, ANF = never>
+            (failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF): Promise<ARF, AJF, ANF>;
+    }
+
+    interface DeferredStatic {
+        // https://jquery.com/upgrade-guide/3.0/#callback-exit
+        exceptionHook: any;
+        <TR = any, TJ = any, TN = any>(beforeStart?: (this: JQuery.Deferred<TR, TJ, TN>, deferred: JQuery.Deferred<TR, TJ, TN>) => void): JQuery.Deferred<TR, TJ, TN>;
+    }
+
+    interface Deferred<TR, TJ = any, TN = any> extends JQuery.Promise<TR, TJ, TN> {
+        /**
+         * Call the progressCallbacks on a Deferred object with the given args.
+         *
+         * @param args Optional arguments that are passed to the progressCallbacks.
+         * @see {@link https://api.jquery.com/deferred.notify/}
+         * @since 1.7
+         */
+        notify(...args: TN[]): this;
+        /**
+         * Call the progressCallbacks on a Deferred object with the given context and args.
+         *
+         * @param context Context passed to the progressCallbacks as the this object.
+         * @param args An optional array of arguments that are passed to the progressCallbacks.
+         * @see {@link https://api.jquery.com/deferred.notifyWith/}
+         * @since 1.7
+         */
+        notifyWith(context: object, args?: ArrayLike<TN>): this;
+        /**
+         * Reject a Deferred object and call any failCallbacks with the given args.
+         *
+         * @param args Optional arguments that are passed to the failCallbacks.
+         * @see {@link https://api.jquery.com/deferred.reject/}
+         * @since 1.5
+         */
+        reject(...args: TJ[]): this;
+        /**
+         * Reject a Deferred object and call any failCallbacks with the given context and args.
+         *
+         * @param context Context passed to the failCallbacks as the this object.
+         * @param args An optional array of arguments that are passed to the failCallbacks.
+         * @see {@link https://api.jquery.com/deferred.rejectWith/}
+         * @since 1.5
+         */
+        rejectWith(context: object, args?: ArrayLike<TJ>): this;
+        /**
+         * Resolve a Deferred object and call any doneCallbacks with the given args.
+         *
+         * @param args Optional arguments that are passed to the doneCallbacks.
+         * @see {@link https://api.jquery.com/deferred.resolve/}
+         * @since 1.5
+         */
+        resolve(...args: TR[]): this;
+        /**
+         * Resolve a Deferred object and call any doneCallbacks with the given context and args.
+         *
+         * @param context Context passed to the doneCallbacks as the this object.
+         * @param args An optional array of arguments that are passed to the doneCallbacks.
+         * @see {@link https://api.jquery.com/deferred.resolveWith/}
+         * @since 1.5
+         */
+        resolveWith(context: object, args?: ArrayLike<TR>): this;
+    }
+
+    namespace Deferred {
+        interface Callback3<T, U, V> {
+            (t: T, u: U, v: V): void;
+        }
+
+        interface Callback<T> {
+            (...args: T[]): void;
+        }
 
         /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
+         * @deprecated
          */
-        pipe<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR3, AJ3, AN3> | Thenable<AN3> | AN3): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR = TJ, AJ = TJ, AN = TN>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AN> | AN): JQuery.Promise<AR, AJ, AN>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
-             progressFilter?: null): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR, AJ = never, AN = TN>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR,
-             progressFilter?: null): JQuery.Promise<AR, AJ, AN>;
-        /**
-         * Utility method to filter and/or chain Deferreds.
-         *
-         * @param doneFilter An optional function that is called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
-         * @since 1.6
-         * @since 1.7
-         * @deprecated 1.8
-         */
-        pipe<AR, AJ = TJ, AN = TN>
-            (doneFilter: ((...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR) | null,
-             failFilter?: null,
-             progressFilter?: null): JQuery.Promise<AR, AJ, AN>;
+        interface DoneCallback<TResolve> extends Callback<TResolve> { }
 
         /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
+         * @deprecated
          */
-        then<AR1, AR2, AR3 = never, AJ1 = never, AJ2 = never, AJ3 = never, AN1 = AN3, AN2 = AN3, AN3 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR3, AJ3, AN3> | Thenable<AN3> | AN3): JQuery.Promise<AR1 | AR2 | AR3, AJ1 | AJ2 | AJ3, AN1 | AN2 | AN3>;
+        interface FailCallback<TReject> extends Callback<TReject> { }
+
         /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
+         * @deprecated
          */
-        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
+        interface AlwaysCallback<TResolve, TReject> extends Callback<TResolve | TReject> { }
+
         /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
+         * @deprecated
          */
-        then<AR1, AR2 = never, AJ1 = never, AJ2 = never, AN1 = AN2, AN2 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AN1> | AN1): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR = TJ, AJ = TJ, AN = TN>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AN> | AN): JQuery.Promise<AR, AJ, AN>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR1, AR2, AJ1 = never, AJ2 = never, AN1 = TN, AN2 = TN>
-            (doneFilter: (...t: TR[]) => JQuery.Promise<AR1, AJ1, AN1> | Thenable<AR1> | AR1,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR2, AJ2, AN2> | Thenable<AR2> | AR2,
-             progressFilter?: null): JQuery.Promise<AR1 | AR2, AJ1 | AJ2, AN1 | AN2>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @param failFilter An optional function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR, AJ = never, AN = TN>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR,
-             progressFilter?: null): JQuery.Promise<AR, AJ, AN>;
-        /**
-         * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
-         *
-         * @param doneFilter A function that is called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.then/}
-         * @since 1.8
-         */
-        then<AR, AJ = TJ, AN = TN>
-            (doneFilter: ((...t: TR[]) => JQuery.Promise<AR, AJ, AN> | Thenable<AR> | AR) | null,
-             failFilter?: null,
-             progressFilter?: null): JQuery.Promise<AR, AJ, AN>;
+        interface ProgressCallback<TNotify> extends Callback<TNotify> { }
     }
 
     // endregion
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 7347a8a415..e6a9907958 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4579,9 +4579,9 @@ function JQueryStatic() {
         }
 
         function Promise2() {
-            const t = $.Deferred() as JQuery.Promise2<string, Error, number, boolean, any, any>;
-            const u = $.Deferred() as JQuery.Promise2<string, Error, number, boolean, any, any>;
-            const v = $.Deferred() as JQuery.Promise2<string, Error, number, boolean, any, any>;
+            const t: JQuery.Promise2<string, Error, number, boolean, any, any> = {} as any;
+            const u: JQuery.Promise2<string, Error, number, boolean, any, any> = {} as any;
+            const v: JQuery.Promise2<string, Error, number, boolean, any, any> = {} as any;
 
             // 3 parameters
             {
@@ -4746,12 +4746,9 @@ function JQueryStatic() {
 
                     $.when(task1, task2, task3)
                         .done((r1, r2, r3) => {
-                            // $ExpectType One
-                            r1;
-                            // $ExpectType Two
-                            r2;
-                            // $ExpectType Three
-                            r3;
+                            r1; // $ExpectType One
+                            r2; // $ExpectType Two
+                            r3; // $ExpectType Three
                         });
                 }
 
@@ -5916,39 +5913,33 @@ function _Promise(p: JQuery.Promise<string, Error, number>) {
             a; // $ExpectType string
         }, (a) => {
             a; // $ExpectType Error
-        });
+        }, null);
 
         p.then((a) => {
             a; // $ExpectType string
         }, (a) => {
             a; // $ExpectType Error
-        }, null);
-
-        p.then(null, (a) => {
-            a; // $ExpectType Error
         });
 
         p.then(null, (a) => {
             a; // $ExpectType Error
         }, null);
 
-        p.then((a) => {
-            a; // $ExpectType string
+        p.then(null, (a) => {
+            a; // $ExpectType Error
         });
 
-        p.then((a) => {
-            a; // $ExpectType string
-        }, null);
-
         p.then((a) => {
             a; // $ExpectType string
         }, null, null);
 
-        p.then(null);
+        p.then((a) => {
+            a; // $ExpectType string
+        }, null);
 
-        p.then(null, null);
-
-        p.then(null, null, null);
+        p.then((a) => {
+            a; // $ExpectType string
+        });
 
         function doneFilter() {
             p.then(() => {

From 5630ea2dec2ad510c257d6e4ec3696c38cd80b5c Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Wed, 28 Jun 2017 01:25:19 +0300
Subject: [PATCH 094/287] Unified type parameter and property types.

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 577959ae7b..621f8203b0 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -10,8 +10,9 @@
 //                 Eric Anderson <https://github.com/ericanderson>
 //                 Albert Kurniawan <https://github.com/morcerf>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
+//                 Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 type NativeAnimationEvent = AnimationEvent;
 type NativeClipboardEvent = ClipboardEvent;
@@ -49,7 +50,7 @@ declare namespace React {
     }
 
     interface ReactElement<P> {
-        type: string | ComponentClass<P> | SFC<P>;
+        type: keyof ReactHTML | ComponentClass<P> | SFC<P>;
         props: P;
         key: Key | null;
     }
@@ -67,7 +68,7 @@ declare namespace React {
     type ClassicElement<P> = CElement<P, ClassicComponent<P, ComponentState>>;
 
     interface DOMElement<P extends DOMAttributes<T>, T extends Element> extends ReactElement<P> {
-        type: string;
+        type: keyof ReactHTML;
         ref: Ref<T>;
     }
 
@@ -128,7 +129,7 @@ declare namespace React {
     function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
 
     function createFactory<P extends DOMAttributes<T>, T extends Element>(
-        type: string): DOMFactory<P, T>;
+        type: keyof ReactHTML): DOMFactory<P, T>;
     function createFactory<P>(type: SFC<P>): SFCFactory<P>;
     function createFactory<P>(
         type: ClassType<P, ClassicComponent<P, ComponentState>, ClassicComponentClass<P>>): CFactory<P, ClassicComponent<P, ComponentState>>;

From d1a4134e773639eadfa6c2e3ee73283029045f02 Mon Sep 17 00:00:00 2001
From: Ben Bayard <bjbayard@gmail.com>
Date: Tue, 27 Jun 2017 15:29:54 -0700
Subject: [PATCH 095/287] Use correct export for generated classes - Use
 semicolons in interface declaration. - Use correct function syntax for onDrop
 methods

---
 types/react-dropzone/index.d.ts               | 46 ++++++++--------
 types/react-dropzone/react-dropzone-tests.tsx | 53 ++++++++++---------
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/types/react-dropzone/index.d.ts b/types/react-dropzone/index.d.ts
index 1ef7932e0d..dfa2a861b2 100644
--- a/types/react-dropzone/index.d.ts
+++ b/types/react-dropzone/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for react-dropzone
 // Project: https://github.com/okonet/react-dropzone
 // Definitions by: Mathieu Larouche Dube <https://github.com/matdube>, Ivo Jesus <https://github.com/LynxEyes>, Luís Rodrigues <https://github.com/goblindegook>, Ben Bayard <https://github.com/benbayard>
-
 // Definitions: https://github.com/Vooban/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -10,37 +9,36 @@
 declare module "react-dropzone" {
     interface DropzoneProps {
         // Drop behavior
-        onDrop?: Function,
-        onDropAccepted?: Function,
-        onDropRejected?: Function,
+        onDrop?: (accepted: File[], rejected: File[]) => any;
+        onDropAccepted?: (accepted: File[]) => any;
+        onDropRejected?: (rejected: File[]) => any;
 
         // Drag behavior
-        onDragStart?: Function,
-        onDragEnter?: Function,
-        onDragLeave?: Function,
+        onDragStart?: Function;
+        onDragEnter?: Function;
+        onDragLeave?: Function;
 
-        style?: Object, // CSS styles to apply
-        activeStyle?: Object, // CSS styles to apply when drop will be accepted
-        rejectStyle?: Object, // CSS styles to apply when drop will be rejected
-        className?: string, // Optional className
-        activeClassName?: string, // className for accepted state
-        rejectClassName?: string, // className for rejected state
+        style?: React.CSSProperties; // CSS styles to apply
+        activeStyle?: React.CSSProperties; // CSS styles to apply when drop will be accepted
+        rejectStyle?: React.CSSProperties; // CSS styles to apply when drop will be rejected
+        className?: string; // Optional className
+        activeClassName?: string; // className for accepted state
+        rejectClassName?: string; // className for rejected state
 
-        disablePreview?: boolean, // Enable/disable preview generation
-        disableClick?: boolean, // Disallow clicking on the dropzone container to open file dialog
+        disablePreview?: boolean; // Enable/disable preview generation
+        disableClick?: boolean; // Disallow clicking on the dropzone container to open file dialog
 
-        inputProps?: Object, // Pass additional attributes to the <input type="file"/> tag
-        multiple?: boolean, // Allow dropping multiple files
-        accept?: string, // Allow specific types of files. See https://github.com/okonet/attr-accept for more information
-        name?: string, // name attribute for the input tag
-        maxSize?: number,
-        minSize?: number
+        inputProps?: React.ChangeTargetHTMLProps<HTMLInputElement>; // Pass additional attributes to the <input type="file"/> tag
+        multiple?: boolean; // Allow dropping multiple files
+        accept?: string; // Allow specific types of files. See https://github.com/okonet/attr-accept for more information
+        name?: string; // name attribute for the input tag
+        maxSize?: number;
+        minSize?: number;
 
         onFileDialogCancel?: () => void;
     }
 
-    export declare class Dropzone extends React.Component<DropzoneProps, never> {
-        open(): void;
-    }
+    class Dropzone extends React.Component<DropzoneProps, never> {}
+
     export = Dropzone;
 }
diff --git a/types/react-dropzone/react-dropzone-tests.tsx b/types/react-dropzone/react-dropzone-tests.tsx
index aaa499a3e3..b4398b5780 100644
--- a/types/react-dropzone/react-dropzone-tests.tsx
+++ b/types/react-dropzone/react-dropzone-tests.tsx
@@ -1,36 +1,41 @@
 import * as React from 'react';
-import * as Dropzone from 'react-dropzone';
+import Dropzone = require('react-dropzone');
 
 class Test extends React.Component {
   constructor(props: any) {
     super(props);
   }
 
+  dz: Dropzone;
+
   render() {
-    return (<div>
-      <Dropzone
-        onDrop={(e: any) => { e.preventDefault(); } }
-        onDropAccepted={(e: any) => { e.preventDefault(); } }
-        onDropRejected={(e: any) => { e.preventDefault(); } }
-        onDragStart={(e: any) => { e.preventDefault(); } }
-        onDragEnter={(e: any) => { e.preventDefault(); } }
-        onDragLeave={(e: any) => { e.preventDefault(); } }
-        style={{ borderStyle: "dashed" }}
-        activeStyle={{ borderStyle: "dotted" }}
-        rejectStyle={{ borderStyle: "dotted" }}
-        className="regular"
-        activeClassName="active"
-        rejectClassName="reject"
-        minSize={2000}
-        maxSize={Infinity}
-        disablePreview={true}
-        disableClick={true}
-        multiple={false}
-        accept="*.png"
-        name="dropzone"
-        inputProps={{ id: "dropzone" }}
+    return (
+      <div>
+        <Dropzone
+          ref={(node) => { this.dz = node } }
+          onDrop={(e: any) => { e.preventDefault(); } }
+          onDropAccepted={(e: any) => { e.preventDefault(); } }
+          onDropRejected={(e: any) => { e.preventDefault(); } }
+          onDragStart={(e: any) => { e.preventDefault(); } }
+          onDragEnter={(e: any) => { e.preventDefault(); } }
+          onDragLeave={(e: any) => { e.preventDefault(); } }
+          style={{ borderStyle: "dashed" }}
+          activeStyle={{ borderStyle: "dotted" }}
+          rejectStyle={{ borderStyle: "dotted" }}
+          className="regular"
+          activeClassName="active"
+          rejectClassName="reject"
+          minSize={2000}
+          maxSize={Infinity}
+          disablePreview={true}
+          disableClick={true}
+          multiple={false}
+          accept="*.png"
+          name="dropzone"
+          inputProps={{ id: "dropzone" }}
         />
-      </div>);
+      </div>
+    );
   }
 }
 

From 7dc0047930f17430a6c68e603bc9370211b12a10 Mon Sep 17 00:00:00 2001
From: Ben Bayard <bjbayard@gmail.com>
Date: Tue, 27 Jun 2017 15:34:17 -0700
Subject: [PATCH 096/287] Add typescript definition for open method - Include
 test

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

diff --git a/types/react-dropzone/index.d.ts b/types/react-dropzone/index.d.ts
index dfa2a861b2..c47b64d9bc 100644
--- a/types/react-dropzone/index.d.ts
+++ b/types/react-dropzone/index.d.ts
@@ -38,7 +38,9 @@ declare module "react-dropzone" {
         onFileDialogCancel?: () => void;
     }
 
-    class Dropzone extends React.Component<DropzoneProps, never> {}
+    class Dropzone extends React.Component<DropzoneProps, never> {
+        open(): void;
+    }
 
     export = Dropzone;
 }
diff --git a/types/react-dropzone/react-dropzone-tests.tsx b/types/react-dropzone/react-dropzone-tests.tsx
index b4398b5780..95c3886454 100644
--- a/types/react-dropzone/react-dropzone-tests.tsx
+++ b/types/react-dropzone/react-dropzone-tests.tsx
@@ -8,6 +8,10 @@ class Test extends React.Component {
 
   dz: Dropzone;
 
+  open() {
+    this.dz.open();
+  }
+
   render() {
     return (
       <div>

From b40c38c085b086026b70127f4d012d9e6dfe6fa4 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Tue, 27 Jun 2017 18:34:56 -0400
Subject: [PATCH 097/287] [jquery] Fix Promise.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 658a463c83..ab44375843 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4714,6 +4714,16 @@ declare namespace JQuery {
         UR, UJ, UN,
         never, never, never> { }
 
+    /**
+     * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
+     * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
+     *
+     * @see {@link http://api.jquery.com/Types/#Promise}
+     */
+    interface Promise1<TR, TJ, TN> extends Promise3<TR, TJ, TN,
+        never, never, never,
+        never, never, never> { }
+
     /**
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
@@ -4800,7 +4810,7 @@ declare namespace JQuery {
             ARF = never, AJF = never, ANF = never,
             ARP = never, AJP = never, ANP = never>
             (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
-             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
+             failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
              progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP>;
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -4816,7 +4826,7 @@ declare namespace JQuery {
         pipe<ARF = never, AJF = never, ANF = never,
             ARP = never, AJP = never, ANP = never>
             (doneFilter: null,
-             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
+             failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<AJF> | AJF,
              progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARF | ARP, AJF | AJP, ANF | ANP>;
         /**
          * Utility method to filter and/or chain Deferreds.
@@ -4906,7 +4916,7 @@ declare namespace JQuery {
             ARF = never, AJF = never, ANF = never,
             ARP = never, AJP = never, ANP = never>
             (doneFilter: (...t: TR[]) => Promise<ARD, AJD, AND> | Thenable<ARD> | ARD,
-             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF,
+             failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF,
              progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.
@@ -4920,7 +4930,7 @@ declare namespace JQuery {
         then<ARF = never, AJF = never, ANF = never,
             ARP = never, AJP = never, ANP = never>
             (doneFilter: null,
-             failFilter: (...t: TR[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF,
+             failFilter: (...t: TJ[]) => Promise<ARF, AJF, ANF> | Thenable<ARF> | ARF,
              progressFilter: (...t: TN[]) => Promise<ARP, AJP, ANP> | Thenable<ANP> | ANP): Promise<ARF | ARP, AJF | AJP, ANF | ANP>;
         /**
          * Add handlers to be called when the Deferred object is resolved, rejected, or still in progress.

From d9d37590649a62b211bd079edef66bafc8b9ef51 Mon Sep 17 00:00:00 2001
From: Andre Wiggins <andwi@microsoft.com>
Date: Tue, 27 Jun 2017 16:01:43 -0700
Subject: [PATCH 098/287] Extend Angular jqLite static interface

---
 types/angular/angular-tests.ts | 6 ++++--
 types/angular/jqlite.d.ts      | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/types/angular/angular-tests.ts b/types/angular/angular-tests.ts
index 6a601910d0..20de01f71f 100644
--- a/types/angular/angular-tests.ts
+++ b/types/angular/angular-tests.ts
@@ -627,11 +627,13 @@ function test_angular_forEach() {
 }
 
 // angular.element() tests
-let element = angular.element('div.myApp');
+let element = angular.element('<div></div>');
 let scope: ng.IScope = element.scope();
 let isolateScope: ng.IScope = element.isolateScope();
-isolateScope = element.find('div.foo').isolateScope();
+isolateScope = element.find('div').isolateScope();
 isolateScope = element.children().isolateScope();
+let element2 = angular.element(element);
+let elementArray = angular.element(document.querySelectorAll('div'));
 
 // $timeout signature tests
 namespace TestTimeout {
diff --git a/types/angular/jqlite.d.ts b/types/angular/jqlite.d.ts
index 727e7718d7..150c50b5dd 100644
--- a/types/angular/jqlite.d.ts
+++ b/types/angular/jqlite.d.ts
@@ -20,6 +20,7 @@
 //                 Dick van den Brink <https://github.com/DickvdBrink>
 //                 Thomas Schulz <https://github.com/King2500>
 //                 Leonard Thieu <https://github.com/leonard-thieu>
+//                 Andre Wiggins <https://github.com/andrewiggins>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Definitions copied from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/0480c5ec87fab41aa23047a02b27f0ea71aaf975/types/jquery/v2/index.d.ts
@@ -666,7 +667,7 @@ interface JQuery {
 }
 
 interface JQueryStatic {
-    (element: string | Element | Document): JQuery;
+    (element: string | Element | Document | JQuery | ArrayLike<Element>): JQuery;
 }
 
 /**

From db5a6f4bc4da9c36b89ad8059df0800eaae515cc Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Tue, 27 Jun 2017 19:08:27 -0400
Subject: [PATCH 099/287] [jquery] Formatting.

---
 types/jquery/jquery-tests.ts | 123 ++++++++++++-----------------------
 1 file changed, 41 insertions(+), 82 deletions(-)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index e6a9907958..b21aeb6427 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4458,52 +4458,31 @@ function JQueryStatic() {
                 const w = $.when(t, u, v);
 
                 w.then((a, b, c) => {
-                    // $ExpectType string
-                    a[0];
-                    // $ExpectType SuccessTextStatus
-                    a[1];
-                    // $ExpectType jqXHR<string>
-                    a[2];
-                    // $ExpectType number
-                    b[0];
-                    // $ExpectType SuccessTextStatus
-                    b[1];
-                    // $ExpectType jqXHR<number>
-                    b[2];
-                    // $ExpectType boolean
-                    c[0];
-                    // $ExpectType SuccessTextStatus
-                    c[1];
-                    // $ExpectType jqXHR<boolean>
-                    c[2];
+                    a[0]; // $ExpectType string
+                    a[1]; // $ExpectType SuccessTextStatus
+                    a[2]; // $ExpectType jqXHR<string>
+                    b[0]; // $ExpectType number
+                    b[1]; // $ExpectType SuccessTextStatus
+                    b[2]; // $ExpectType jqXHR<number>
+                    c[0]; // $ExpectType boolean
+                    c[1]; // $ExpectType SuccessTextStatus
+                    c[2]; // $ExpectType jqXHR<boolean>
                 });
                 w.catch((a, b, c) => {
-                    // $ExpectType jqXHR<string>
-                    a[0];
-                    // $ExpectType ErrorTextStatus
-                    a[1];
-                    // $ExpectType string
-                    a[2];
-                    // $ExpectType jqXHR<number>
-                    b[0];
-                    // $ExpectType ErrorTextStatus
-                    b[1];
-                    // $ExpectType string
-                    b[2];
-                    // $ExpectType jqXHR<boolean>
-                    c[0];
-                    // $ExpectType ErrorTextStatus
-                    c[1];
-                    // $ExpectType string
-                    c[2];
+                    a[0]; // $ExpectType jqXHR<string>
+                    a[1]; // $ExpectType ErrorTextStatus
+                    a[2]; // $ExpectType string
+                    b[0]; // $ExpectType jqXHR<number>
+                    b[1]; // $ExpectType ErrorTextStatus
+                    b[2]; // $ExpectType string
+                    c[0]; // $ExpectType jqXHR<boolean>
+                    c[1]; // $ExpectType ErrorTextStatus
+                    c[2]; // $ExpectType string
                 });
                 w.then(null, null, (a, b, c) => {
-                    // $ExpectType never
-                    a;
-                    // $ExpectType never
-                    b;
-                    // $ExpectType never
-                    c;
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
                 });
             }
 
@@ -4512,38 +4491,24 @@ function JQueryStatic() {
                 const w = $.when(t, u);
 
                 w.then((a, b) => {
-                    // $ExpectType string
-                    a[0];
-                    // $ExpectType SuccessTextStatus
-                    a[1];
-                    // $ExpectType jqXHR<string>
-                    a[2];
-                    // $ExpectType number
-                    b[0];
-                    // $ExpectType SuccessTextStatus
-                    b[1];
-                    // $ExpectType jqXHR<number>
-                    b[2];
+                    a[0]; // $ExpectType string
+                    a[1]; // $ExpectType SuccessTextStatus
+                    a[2]; // $ExpectType jqXHR<string>
+                    b[0]; // $ExpectType number
+                    b[1]; // $ExpectType SuccessTextStatus
+                    b[2]; // $ExpectType jqXHR<number>
                 });
                 w.catch((a, b) => {
-                    // $ExpectType jqXHR<string>
-                    a[0];
-                    // $ExpectType ErrorTextStatus
-                    a[1];
-                    // $ExpectType string
-                    a[2];
-                    // $ExpectType jqXHR<number>
-                    b[0];
-                    // $ExpectType ErrorTextStatus
-                    b[1];
-                    // $ExpectType string
-                    b[2];
+                    a[0]; // $ExpectType jqXHR<string>
+                    a[1]; // $ExpectType ErrorTextStatus
+                    a[2]; // $ExpectType string
+                    b[0]; // $ExpectType jqXHR<number>
+                    b[1]; // $ExpectType ErrorTextStatus
+                    b[2]; // $ExpectType string
                 });
                 w.then(null, null, (a, b) => {
-                    // $ExpectType never
-                    a;
-                    // $ExpectType never
-                    b;
+                    a; // $ExpectType never
+                    b; // $ExpectType never
                 });
             }
 
@@ -4568,12 +4533,9 @@ function JQueryStatic() {
                     errorThrown;
                 });
                 w.then(null, null, (a, b, c) => {
-                    // $ExpectType never
-                    a;
-                    // $ExpectType never
-                    b;
-                    // $ExpectType never
-                    c;
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
                 });
             }
         }
@@ -4732,16 +4694,13 @@ function JQueryStatic() {
                     const task3 = this.runTask3();
 
                     task1.then(value => {
-                        // $ExpectType One
-                        value;
+                        value; // $ExpectType One
                     });
                     task2.then(value => {
-                        // $ExpectType Two
-                        value;
+                        value; // $ExpectType Two
                     });
                     task3.then(value => {
-                        // $ExpectType Three
-                        value;
+                        value; // $ExpectType Three
                     });
 
                     $.when(task1, task2, task3)

From 8f9b483fe79d62d568d1f216dc8eb4f877e06ede Mon Sep 17 00:00:00 2001
From: e020873 <nicolas.henry-partner@arcelormittal.com>
Date: Wed, 21 Jun 2017 11:22:18 +0200
Subject: [PATCH 100/287] [jsdom] fix v11 type definitions

---
 types/jsdom/index.d.ts     | 162 +++++++++++++++++--------------------
 types/jsdom/jsdom-tests.ts |  18 ++---
 2 files changed, 85 insertions(+), 95 deletions(-)

diff --git a/types/jsdom/index.d.ts b/types/jsdom/index.d.ts
index ca17ea4bbf..ca2a1aad41 100644
--- a/types/jsdom/index.d.ts
+++ b/types/jsdom/index.d.ts
@@ -12,17 +12,17 @@ import * as tough from 'tough-cookie';
 import { Script } from 'vm';
 
 export class JSDOM {
-    static fromURL(url: string | Buffer | jsdom.BinaryData, options?: jsdom.FromUrlOptions | object): Promise<JSDOM>;
+    static fromURL(url: string, options?: FromUrlOptions): Promise<JSDOM>;
 
-    static fromFile(url: string | Buffer | jsdom.BinaryData, options?: jsdom.Options | object): Promise<JSDOM>;
+    static fromFile(url: string, options?: FromFileOptions): Promise<JSDOM>;
 
     static fragment(html: string): DocumentFragment;
 
-    constructor(html?: string | Buffer | jsdom.BinaryData, options?: jsdom.Options | object);
+    constructor(html?: string | Buffer | BinaryData, options?: ConstructorOptions);
 
-    readonly window: jsdom.Window;
-    readonly virtualConsole: jsdom.VirtualConsole;
-    readonly cookieJar: jsdom.CookieJar;
+    readonly window: DOMWindow;
+    readonly virtualConsole: VirtualConsole;
+    readonly cookieJar: CookieJar;
 
     /**
      * The serialize() method will return the HTML serialization of the document, including the doctype.
@@ -42,97 +42,87 @@ export class JSDOM {
      */
     runVMScript(script: Script): void;
 
-    reconfigure(settings: jsdom.ReconfigureSettings | object): void;
+    reconfigure(settings: ReconfigureSettings): void;
 }
 
-// Alias DOM Window so we can extend from it and still name the type Window
-// tslint:disable-next-line strict-export-declare-modifiers
-type DOMWindow = Window;
+export interface Options {
+    /**
+     * referrer just affects the value read from document.referrer.
+     * It defaults to no referrer (which reflects as the empty string).
+     */
+    referrer?: string;
+    /**
+     * userAgent affects the value read from navigator.userAgent, as well as the User-Agent header sent while fetching subresources.
+     * It defaults to `Mozilla/5.0 (${process.platform}) AppleWebKit/537.36 (KHTML, like Gecko) jsdom/${jsdomVersion}`.
+     */
+    userAgent?: string;
+    /**
+     * includeNodeLocations preserves the location info produced by the HTML parser,
+     * allowing you to retrieve it with the nodeLocation() method (described below).
+     * It defaults to false to give the best performance,
+     * and cannot be used with an XML content type since our XML parser does not support location info.
+     */
+    includeNodeLocations?: boolean;
+    runScripts?: 'dangerously' | 'outside-only';
+    resources?: 'usable';
+    virtualConsole?: VirtualConsole;
+    cookieJar?: CookieJar;
+    beforeParse?(window: DOMWindow): void;
+}
 
-export namespace jsdom {
-    interface FromUrlOptions extends Pick<FromUrlOptions._Impl, keyof FromUrlOptions._Impl> { }
+export type FromUrlOptions = Options;
 
-    namespace FromUrlOptions {
-        interface _Impl {
-            /**
-             * referrer just affects the value read from document.referrer.
-             * It defaults to no referrer (which reflects as the empty string).
-             */
-            referrer: string;
-            /**
-             * userAgent affects the value read from navigator.userAgent, as well as the User-Agent header sent while fetching subresources.
-             * It defaults to `Mozilla/5.0 (${process.platform}) AppleWebKit/537.36 (KHTML, like Gecko) jsdom/${jsdomVersion}`.
-             */
-            userAgent: string;
-            /**
-             * includeNodeLocations preserves the location info produced by the HTML parser,
-             * allowing you to retrieve it with the nodeLocation() method (described below).
-             * It defaults to false to give the best performance,
-             * and cannot be used with an XML content type since our XML parser does not support location info.
-             */
-            includeNodeLocations: boolean;
-            runScripts: 'dangerously' | 'outside-only';
-            resources: 'usable';
-            virtualConsole: VirtualConsole;
-            cookieJar: CookieJar;
-            beforeParse(window: jsdom.Window): void;
-        }
-    }
+export type FromFileOptions = Options & {
+    /**
+     * url sets the value returned by window.location, document.URL, and document.documentURI,
+     * and affects things like resolution of relative URLs within the document
+     * and the same-origin restrictions and referrer used while fetching subresources.
+     * It will default to a file URL corresponding to the given filename, instead of to "about:blank".
+     */
+    url?: string;
+    /**
+     * contentType affects the value read from document.contentType, and how the document is parsed: as HTML or as XML.
+     * Values that are not "text/html" or an XML mime type will throw. It will default to "application/xhtml+xml" if
+     * the given filename ends in .xhtml or .xml; otherwise it will continue to default to "text/html".
+     */
+    contentType?: string;
+};
 
-    interface Options extends Pick<Options._Impl, keyof Options._Impl> { }
+export type ConstructorOptions = Options & {
+    /**
+     * url sets the value returned by window.location, document.URL, and document.documentURI,
+     * and affects things like resolution of relative URLs within the document
+     * and the same-origin restrictions and referrer used while fetching subresources.
+     * It defaults to "about:blank".
+     */
+    url?: string;
+    /**
+     * contentType affects the value read from document.contentType, and how the document is parsed: as HTML or as XML.
+     * Values that are not "text/html" or an XML mime type will throw. It defaults to "text/html".
+     */
+    contentType?: string;
+};
 
-    namespace Options {
-        interface _Impl extends FromUrlOptions._Impl {
-            /**
-             * url sets the value returned by window.location, document.URL, and document.documentURI,
-             * and affects things like resolution of relative URLs within the document
-             * and the same-origin restrictions and referrer used while fetching subresources.
-             * It defaults to "about:blank".
-             */
-            url: string;
-            /**
-             * contentType affects the value read from document.contentType, and how the document is parsed: as HTML or as XML.
-             * Values that are not "text/html" or an XML mime type will throw. It defaults to "text/html".
-             */
-            contentType: string;
-        }
-    }
+export interface DOMWindow extends Window { eval(script: string): void; }
 
-    interface Window extends DOMWindow {
-        ran: number;
+export type BinaryData = ArrayBuffer | DataView | Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
 
-        eval(script: string): void;
-    }
+export class VirtualConsole extends EventEmitter {
+    on<K extends keyof Console>(method: K, callback: Console[K]): this;
+    on(event: 'jsdomError', callback: (e: Error) => void): this;
 
-    type BinaryData = ArrayBuffer | DataView | Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
+    sendTo(console: Console, options?: VirtualConsoleSendToOptions): this;
+}
 
-    class VirtualConsole extends EventEmitter {
-        on<K extends keyof Console>(method: K, callback: Console[K]): this;
-        on(event: 'jsdomError', callback: (e: Error) => void): this;
+export interface VirtualConsoleSendToOptions {
+    omitJSDOMErrors: boolean;
+}
 
-        sendTo(console: Console, options?: VirtualConsole.SendToOptions | object): this;
-    }
+export class CookieJar extends tough.CookieJar { }
 
-    namespace VirtualConsole {
-        interface SendToOptions extends Pick<SendToOptions._Impl, keyof SendToOptions._Impl> { }
+export const toughCookie: typeof tough;
 
-        namespace SendToOptions {
-            interface _Impl {
-                omitJSDOMErrors: boolean;
-            }
-        }
-    }
-
-    class CookieJar extends tough.CookieJar { }
-
-    const toughCookie: typeof tough;
-
-    interface ReconfigureSettings extends Pick<ReconfigureSettings._Impl, keyof ReconfigureSettings._Impl> { }
-
-    namespace ReconfigureSettings {
-        interface _Impl {
-            windowTop: DOMWindow;
-            url: string;
-        }
-    }
+export interface ReconfigureSettings {
+    windowTop?: DOMWindow;
+    url?: string;
 }
diff --git a/types/jsdom/jsdom-tests.ts b/types/jsdom/jsdom-tests.ts
index 4c80bd2571..c672580a63 100644
--- a/types/jsdom/jsdom-tests.ts
+++ b/types/jsdom/jsdom-tests.ts
@@ -1,5 +1,5 @@
-import { jsdom, JSDOM } from 'jsdom';
-import { CookieJar, MemoryCookieStore } from 'tough-cookie';
+import { JSDOM, VirtualConsole, CookieJar, FromUrlOptions, FromFileOptions, DOMWindow } from 'jsdom';
+import { CookieJar as ToughCookieJar, MemoryCookieStore } from 'tough-cookie';
 import { Script } from 'vm';
 
 function test_basic_usage() {
@@ -37,7 +37,7 @@ function test_executing_scripts3() {
 }
 
 function test_virtualConsole() {
-    const virtualConsole = new jsdom.VirtualConsole();
+    const virtualConsole = new VirtualConsole();
     const dom = new JSDOM(``, { virtualConsole });
 
     virtualConsole.on('error', () => { });
@@ -54,9 +54,9 @@ function test_virtualConsole() {
 
 function test_cookieJar() {
     const store = {} as MemoryCookieStore;
-    const options = {} as CookieJar.Options;
+    const options = {} as ToughCookieJar.Options;
 
-    const cookieJar = new jsdom.CookieJar(store, options);
+    const cookieJar = new CookieJar(store, options);
     const dom = new JSDOM(``, { cookieJar });
 }
 
@@ -111,11 +111,11 @@ function test_runVMScript() {
     dom.runVMScript(s);
     dom.runVMScript(s);
 
-    dom.window.ran === 3;
+    (<any> dom.window).ran === 3;
 }
 
 function test_reconfigure() {
-    const myFakeTopForTesting = {} as Window;
+    const myFakeTopForTesting = {} as DOMWindow;
 
     const dom = new JSDOM();
 
@@ -129,7 +129,7 @@ function test_reconfigure() {
 }
 
 function test_fromURL() {
-    const options = {} as jsdom.FromUrlOptions;
+    const options = {} as FromUrlOptions;
 
     JSDOM.fromURL('https://example.com/', options).then(dom => {
         console.log(dom.serialize());
@@ -137,7 +137,7 @@ function test_fromURL() {
 }
 
 function test_fromFile() {
-    const options = {} as jsdom.Options;
+    const options = {} as FromFileOptions;
 
     JSDOM.fromFile('stuff.html', options).then(dom => {
         console.log(dom.serialize());

From b17086bce7caf42cc125409566e61bfd522ed9e6 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Jun 2017 16:21:57 -0700
Subject: [PATCH 101/287] Fix Ramda for 2.4: evolve and functor map

1. Evolve now uses mapped type to more accurately reflect the
resulting type.
2. 2.4's contravariance checking of callbacks caught some incorrect
code. I fixed one instance that was nearly-correct and deleted one
instance that was non-sensical. It created an infinite functor by
returning itself.
---
 types/ramda/index.d.ts     | 13 +++++++------
 types/ramda/ramda-tests.ts | 15 ++++-----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index ba6908d57c..19f85adc74 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -55,15 +55,15 @@ declare namespace R {
         push(x: string): void;
     }
 
-    interface Nested<U> {
-        [index: string]: Nested<U> | (<U>(value: any) => U);
-    }
-
     interface Lens {
         <T, U>(obj: T): U;
         set<T, U>(str: string, obj: T): U;
     }
 
+    type Evolver<T> =
+        | ((x: T) => T)
+        | { [K in keyof T]?: Evolver<T[K]> }
+
     // @see https://gist.github.com/donnut/fd56232da58d25ceecf1, comment by @albrow
     interface CurriedTypeGuard2<T1, T2, R extends T2> {
         (t1: T1): (t2: T2) => t2 is R;
@@ -567,8 +567,9 @@ declare namespace R {
         /**
          * Creates a new object by evolving a shallow copy of object, according to the transformation functions.
          */
-        evolve<V>(transformations: Nested<V>, obj: V): Nested<V>;
-        evolve<V>(transformations: Nested<V>): <V>(obj: V) => Nested<V>;
+        evolve<V>(transformations: Evolver<V>, obj: V): V;
+        evolve<V>(transformations: Evolver<V>): <W extends V>(obj: W) => W;
+
         /*
          * 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 70298f53e6..18a5ed4e7d 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -744,13 +744,13 @@ interface Obj {
     R.map(double, [1, 2, 3]); // => [2, 4, 6]
 
     // functor
-    const stringFunctor = {
-        map: (fn: (c: number) => number) => {
+    const numberFunctor = {
+        map: <U>(fn: (c: number) => U) => {
             let chars = "Ifmmp!Xpsme".split("");
-            return chars.map((char) => String.fromCharCode(fn(char.charCodeAt(0)))).join("") as any;
+            return chars.map(char => fn(char.charCodeAt(0)));
         }
     };
-    R.map((x: number) => x - 1, stringFunctor); // => "Hello World"
+    R.map((x: number) => x - 1, numberFunctor); // => "Hello World"
 };
 
 () => {
@@ -2199,10 +2199,3 @@ class Why {
     R.intersperse(0, [1, 2]); // => [1, 0, 2]
     R.intersperse(0, [1]); // => [1]
 };
-
-{
-    const functor = {
-        map: (fn: (x: string) => string) => functor
-    };
-    R.map(x => x.trim(), functor);
-}

From 9558b1699a029abc25cc127c342c4ef6a7969927 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 27 Jun 2017 16:27:37 -0700
Subject: [PATCH 102/287] Fix lint

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 19f85adc74..cb0241bea7 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -62,7 +62,7 @@ declare namespace R {
 
     type Evolver<T> =
         | ((x: T) => T)
-        | { [K in keyof T]?: Evolver<T[K]> }
+        | { [K in keyof T]?: Evolver<T[K]> };
 
     // @see https://gist.github.com/donnut/fd56232da58d25ceecf1, comment by @albrow
     interface CurriedTypeGuard2<T1, T2, R extends T2> {

From 6c53e8db6e2551cfca54d49aa616b469baf17ab0 Mon Sep 17 00:00:00 2001
From: Vu Tran <vutran@dropbox.com>
Date: Tue, 27 Jun 2017 17:08:37 -0700
Subject: [PATCH 103/287] fix typings

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

diff --git a/is-alphanumerical/index.d.ts b/is-alphanumerical/index.d.ts
index 5974ec9813..940a005b08 100644
--- a/is-alphanumerical/index.d.ts
+++ b/is-alphanumerical/index.d.ts
@@ -3,5 +3,5 @@
 // Definitions by: Vu Tran <https://github.com/vutran>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function isAlphanumerical(val: string | boolean | string): boolean;
+declare function isAlphanumerical(val: string | boolean | number): boolean;
 export = isAlphanumerical;

From a70a977fe4acee57c5f5cf5a9e16575284cde81d Mon Sep 17 00:00:00 2001
From: Brian Lee <brianjleeofcl@gmail.com>
Date: Tue, 27 Jun 2017 17:22:48 -0700
Subject: [PATCH 104/287] Add additional tests

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

diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index aeefc2bbdc..ea177760cb 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -544,6 +544,11 @@ namespace util_tests {
           maxArrayLength: null,
           breakLength: Infinity
         })
+        assert(typeof util.inspect.custom === 'symbol')
+        // util.promisify
+        var readPromised = util.promisify(fs.readFile)
+        var sampleRead: Promise<any> = readPromised(__filename).then((data: string): void => {}).catch((error: Error): void => {})
+        assert(typeof util.promisify.custom === 'symbol')
     }
 }
 

From b6cc60050834200596b74ceb44c715e85261c24e Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Wed, 28 Jun 2017 02:23:02 +0200
Subject: [PATCH 105/287] null! => null thanks to PR #17021

---
 types/react-router/test/ModalGallery.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-router/test/ModalGallery.tsx b/types/react-router/test/ModalGallery.tsx
index f4b55aca20..211e62aa49 100644
--- a/types/react-router/test/ModalGallery.tsx
+++ b/types/react-router/test/ModalGallery.tsx
@@ -130,7 +130,7 @@ const ImageView: React.SFC<RouteComponentProps<{ id: string }>> = ({ match }) =>
 const Modal: React.SFC<RouteComponentProps<{ id: string }>> = ({ match, history }) => {
   const image = IMAGES[parseInt(match.params.id, 10)];
   if (!image) {
-    return null!;
+    return null;
   }
   const back = (e: React.MouseEvent<HTMLElement>) => {
     e.stopPropagation();

From 42af84cc3a5f629c4d49e896f4f80fdb16147213 Mon Sep 17 00:00:00 2001
From: Brian Lee <brianjleeofcl@gmail.com>
Date: Tue, 27 Jun 2017 17:24:31 -0700
Subject: [PATCH 106/287] Add properties for util.inspect and util.promisify

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 21d48b504a..23aceac90c 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -3938,8 +3938,17 @@ declare module "util" {
     export function puts(...param: any[]): void;
     export function print(...param: any[]): void;
     export function log(string: string): void;
-    export function inspect(object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
-    export function inspect(object: any, options: InspectOptions): string;
+    export var inspect: {
+        (object: any, showHidden?: boolean, depth?: number | null, color?: boolean): string;
+        (object: any, options: InspectOptions): string;
+        colors: {
+            [color: string]: [number, number]
+        }
+        styles: {
+            [style: string]: string
+        }
+        custom: symbol
+    }
     export function isArray(object: any): object is any[];
     export function isRegExp(object: any): object is RegExp;
     export function isDate(object: any): object is Date;
@@ -3958,7 +3967,10 @@ declare module "util" {
     export function isSymbol(object: any): object is symbol;
     export function isUndefined(object: any): object is undefined;
     export function deprecate(fn: Function, message: string): Function;
-    export function promisify(fn: Function): Function;
+    export var promisify: {
+        (fn: Function): Function;
+        custom: symbol
+    }
 }
 
 declare module "assert" {

From 354aa9339ccb709e83695850aa7d0e2fa79ecc86 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Wed, 28 Jun 2017 03:39:29 +0300
Subject: [PATCH 107/287] Expanded type with ReactSVG.

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 621f8203b0..46b34637bc 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -50,7 +50,7 @@ declare namespace React {
     }
 
     interface ReactElement<P> {
-        type: keyof ReactHTML | ComponentClass<P> | SFC<P>;
+        type: keyof ReactHTML | keyof ReactSVG | ComponentClass<P> | SFC<P>;
         props: P;
         key: Key | null;
     }
@@ -68,14 +68,16 @@ declare namespace React {
     type ClassicElement<P> = CElement<P, ClassicComponent<P, ComponentState>>;
 
     interface DOMElement<P extends DOMAttributes<T>, T extends Element> extends ReactElement<P> {
-        type: keyof ReactHTML;
+        type: keyof ReactHTML | keyof ReactSVG;
         ref: Ref<T>;
     }
 
     interface ReactHTMLElement<T extends HTMLElement> extends DOMElement<HTMLAttributes<T>, T> {
+        type: keyof ReactHTML;
     }
 
     interface ReactSVGElement extends DOMElement<SVGAttributes<SVGElement>, SVGElement> {
+        type: keyof ReactSVG;
     }
 
     //

From 43c90a8a839851cac01c15ad1c75113647176cc5 Mon Sep 17 00:00:00 2001
From: codemannz <codeman_nz@hotmail.com>
Date: Wed, 28 Jun 2017 12:49:05 +1200
Subject: [PATCH 108/287] changed to Backbone.View<TModel>

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

diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 52d8c7a492..9ffe1460e9 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -1272,7 +1272,7 @@ declare namespace Marionette {
         getRegion(): Region;
 
         /** Show a view in the root region */
-        showView(view: View): void;
+        showView(view: Backbone.View<TModel>): void;
 
         /** Get the view from the root region*/
         getView(): any;

From 13a594f24e60ef9e93aacd8ba40db18aa6fc88d8 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Wed, 28 Jun 2017 03:03:42 +0200
Subject: [PATCH 109/287] Move the official examples to directory
 examples-from-react-router-website

---
 types/react-router/test/README.md             |  1 -
 .../Ambiguous.tsx                             |  0
 .../Animation.tsx                             |  0
 .../Auth.tsx                                  |  0
 .../Basic.tsx                                 |  0
 .../CustomLink.tsx                            |  0
 .../ModalGallery.tsx                          |  0
 .../NoMatch.tsx                               |  0
 .../Params.tsx                                |  0
 .../PreventingTransitions.tsx                 |  0
 .../README.md                                 |  5 ++++
 .../Recursive.tsx                             |  0
 .../RouteConfig.tsx                           |  0
 .../Sidebar.tsx                               |  0
 .../StaticRouter.tsx                          |  0
 types/react-router/tsconfig.json              | 28 ++++++++++---------
 16 files changed, 20 insertions(+), 14 deletions(-)
 delete mode 100644 types/react-router/test/README.md
 rename types/react-router/test/{ => examples-from-react-router-website}/Ambiguous.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/Animation.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/Auth.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/Basic.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/CustomLink.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/ModalGallery.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/NoMatch.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/Params.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/PreventingTransitions.tsx (100%)
 create mode 100644 types/react-router/test/examples-from-react-router-website/README.md
 rename types/react-router/test/{ => examples-from-react-router-website}/Recursive.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/RouteConfig.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/Sidebar.tsx (100%)
 rename types/react-router/test/{ => examples-from-react-router-website}/StaticRouter.tsx (100%)

diff --git a/types/react-router/test/README.md b/types/react-router/test/README.md
deleted file mode 100644
index 341bd29130..0000000000
--- a/types/react-router/test/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Examples taken from https://github.com/ReactTraining/react-router/tree/22bd52c901ef0312348c2b02549c7102bd5653ae/packages/react-router-website/modules/examples
diff --git a/types/react-router/test/Ambiguous.tsx b/types/react-router/test/examples-from-react-router-website/Ambiguous.tsx
similarity index 100%
rename from types/react-router/test/Ambiguous.tsx
rename to types/react-router/test/examples-from-react-router-website/Ambiguous.tsx
diff --git a/types/react-router/test/Animation.tsx b/types/react-router/test/examples-from-react-router-website/Animation.tsx
similarity index 100%
rename from types/react-router/test/Animation.tsx
rename to types/react-router/test/examples-from-react-router-website/Animation.tsx
diff --git a/types/react-router/test/Auth.tsx b/types/react-router/test/examples-from-react-router-website/Auth.tsx
similarity index 100%
rename from types/react-router/test/Auth.tsx
rename to types/react-router/test/examples-from-react-router-website/Auth.tsx
diff --git a/types/react-router/test/Basic.tsx b/types/react-router/test/examples-from-react-router-website/Basic.tsx
similarity index 100%
rename from types/react-router/test/Basic.tsx
rename to types/react-router/test/examples-from-react-router-website/Basic.tsx
diff --git a/types/react-router/test/CustomLink.tsx b/types/react-router/test/examples-from-react-router-website/CustomLink.tsx
similarity index 100%
rename from types/react-router/test/CustomLink.tsx
rename to types/react-router/test/examples-from-react-router-website/CustomLink.tsx
diff --git a/types/react-router/test/ModalGallery.tsx b/types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
similarity index 100%
rename from types/react-router/test/ModalGallery.tsx
rename to types/react-router/test/examples-from-react-router-website/ModalGallery.tsx
diff --git a/types/react-router/test/NoMatch.tsx b/types/react-router/test/examples-from-react-router-website/NoMatch.tsx
similarity index 100%
rename from types/react-router/test/NoMatch.tsx
rename to types/react-router/test/examples-from-react-router-website/NoMatch.tsx
diff --git a/types/react-router/test/Params.tsx b/types/react-router/test/examples-from-react-router-website/Params.tsx
similarity index 100%
rename from types/react-router/test/Params.tsx
rename to types/react-router/test/examples-from-react-router-website/Params.tsx
diff --git a/types/react-router/test/PreventingTransitions.tsx b/types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx
similarity index 100%
rename from types/react-router/test/PreventingTransitions.tsx
rename to types/react-router/test/examples-from-react-router-website/PreventingTransitions.tsx
diff --git a/types/react-router/test/examples-from-react-router-website/README.md b/types/react-router/test/examples-from-react-router-website/README.md
new file mode 100644
index 0000000000..6648c853d0
--- /dev/null
+++ b/types/react-router/test/examples-from-react-router-website/README.md
@@ -0,0 +1,5 @@
+Examples taken from react-router website.
+
+Please keep them in sync and as close as possible to the original ones.
+
+See https://github.com/ReactTraining/react-router/tree/22bd52c901ef0312348c2b02549c7102bd5653ae/packages/react-router-website/modules/examples
diff --git a/types/react-router/test/Recursive.tsx b/types/react-router/test/examples-from-react-router-website/Recursive.tsx
similarity index 100%
rename from types/react-router/test/Recursive.tsx
rename to types/react-router/test/examples-from-react-router-website/Recursive.tsx
diff --git a/types/react-router/test/RouteConfig.tsx b/types/react-router/test/examples-from-react-router-website/RouteConfig.tsx
similarity index 100%
rename from types/react-router/test/RouteConfig.tsx
rename to types/react-router/test/examples-from-react-router-website/RouteConfig.tsx
diff --git a/types/react-router/test/Sidebar.tsx b/types/react-router/test/examples-from-react-router-website/Sidebar.tsx
similarity index 100%
rename from types/react-router/test/Sidebar.tsx
rename to types/react-router/test/examples-from-react-router-website/Sidebar.tsx
diff --git a/types/react-router/test/StaticRouter.tsx b/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
similarity index 100%
rename from types/react-router/test/StaticRouter.tsx
rename to types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
diff --git a/types/react-router/tsconfig.json b/types/react-router/tsconfig.json
index 4790f0b53d..438e3c9647 100644
--- a/types/react-router/tsconfig.json
+++ b/types/react-router/tsconfig.json
@@ -14,22 +14,24 @@
   },
   "files": [
     "index.d.ts",
-    "test/Ambiguous.tsx",
-    "test/Animation.tsx",
-    "test/Auth.tsx",
-    "test/Basic.tsx",
+
+    "test/examples-from-react-router-website/Ambiguous.tsx",
+    "test/examples-from-react-router-website/Animation.tsx",
+    "test/examples-from-react-router-website/Auth.tsx",
+    "test/examples-from-react-router-website/Basic.tsx",
+    "test/examples-from-react-router-website/CustomLink.tsx",
+    "test/examples-from-react-router-website/ModalGallery.tsx",
+    "test/examples-from-react-router-website/NoMatch.tsx",
+    "test/examples-from-react-router-website/Params.tsx",
+    "test/examples-from-react-router-website/PreventingTransitions.tsx",
+    "test/examples-from-react-router-website/Recursive.tsx",
+    "test/examples-from-react-router-website/RouteConfig.tsx",
+    "test/examples-from-react-router-website/Sidebar.tsx",
+    "test/examples-from-react-router-website/StaticRouter.tsx",
+
     "test/Children.tsx",
-    "test/CustomLink.tsx",
-    "test/ModalGallery.tsx",
     "test/NavigateWithContext.tsx",
     "test/MemoryRouter.tsx",
-    "test/NoMatch.tsx",
-    "test/Params.tsx",
-    "test/PreventingTransitions.tsx",
-    "test/Recursive.tsx",
-    "test/RouteConfig.tsx",
-    "test/Sidebar.tsx",
-    "test/StaticRouter.tsx",
     "test/Switch.tsx",
     "test/WithRouter.tsx"
   ]

From d6d4506541ae066873bd88cc02a9333c01d6688d Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Wed, 28 Jun 2017 03:14:26 +0200
Subject: [PATCH 110/287] Long JSDoc, tsconfig.json, tests, merged overloads

---
 package.json                                  |   3 +
 types/activex-adodb/activex-adodb-tests.ts    |  20 +-
 types/activex-adodb/index.d.ts                |  81 ++--
 types/activex-adodb/tsconfig.json             |   2 +-
 .../activex-scripting-tests.ts                |  40 +-
 types/activex-scripting/index.d.ts            | 235 ++++++-----
 types/activex-scripting/tsconfig.json         |   2 +-
 types/activex-wia/activex-wia-tests.ts        |  33 +-
 types/activex-wia/index.d.ts                  | 372 ++++++++++--------
 types/activex-wia/tsconfig.json               |   2 +-
 10 files changed, 435 insertions(+), 355 deletions(-)

diff --git a/package.json b/package.json
index 1be6d06c89..efdebf7e3f 100644
--- a/package.json
+++ b/package.json
@@ -23,5 +23,8 @@
   "devDependencies": {
     "dtslint": "Microsoft/dtslint#production",
     "types-publisher": "Microsoft/types-publisher#production"
+  },
+  "dependencies": {
+    "typescript": "^2.5.0-dev.20170627"
   }
 }
diff --git a/types/activex-adodb/activex-adodb-tests.ts b/types/activex-adodb/activex-adodb-tests.ts
index 341bf83108..cadb01c15e 100644
--- a/types/activex-adodb/activex-adodb-tests.ts
+++ b/types/activex-adodb/activex-adodb-tests.ts
@@ -10,21 +10,21 @@ let obj4 = new ActiveXObject('ADODB.Recordset');
 
 let obj5 = new ActiveXObject('ADODB.Stream');
 
-//open connection to an Excel file
-var pathToExcelFile = 'C:\\path\\to\\excel\\file.xlsx';
-var conn = new ActiveXObject('ADODB.Connection');
+// open connection to an Excel file
+let pathToExcelFile = 'C:\\path\\to\\excel\\file.xlsx';
+let conn = new ActiveXObject('ADODB.Connection');
 conn.Provider = 'Microsoft.ACE.OLEDB.12.0';
 conn.ConnectionString =
     'Data Source="' + pathToExcelFile + '";' +
     'Extended Properties="Excel 12.0;HDR=Yes"';
 conn.Open();
 
-//create a Command to access the data
-var cmd = new ActiveXObject('ADODB.Command');
+// create a Command to access the data
+let cmd = new ActiveXObject('ADODB.Command');
 cmd.CommandText = 'SELECT DISTINCT LastName, CityName FROM [Sheet1$]';
-//get a Recordset
-var rs = cmd.Execute();
-//build a string from the Recordset
-var s = rs.GetString(ADODB.StringFormatEnum.adClipString, -1, '\t', '\n', '(NULL)');
+// get a Recordset
+let rs = cmd.Execute();
+// build a string from the Recordset
+let s = rs.GetString(ADODB.StringFormatEnum.adClipString, -1, '\t', '\n', '(NULL)');
 rs.Close();
-WScript.Echo(s);
\ No newline at end of file
+WScript.Echo(s);
diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 5e89dcd55c..2fa62632ad 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ADODB - 
+// Type definitions for Microsoft ActiveX Data Objects
 // Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -941,52 +941,55 @@ declare namespace ADODB {
         /** @param ADODB.StreamWriteEnum [Options=0] */
         WriteText(Data: string, Options?: StreamWriteEnum): void;
     }
-
 }
 
 interface ActiveXObject {
-    on(obj: ADODB.Connection, event: 'BeginTransComplete', argNames: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {
+    on(obj: ADODB.Connection, event: 'BeginTransComplete', argNames: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (
+        this: ADODB.Connection, parameter: {
         TransactionLevel: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, event: 'CommitTransComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
-         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, event: 'ConnectComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
-         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, event: 'Disconnect', argNames: ['adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum,
-         pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, event: 'ExecuteComplete', argNames: ['RecordsAffected', 'pError', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'],
-         handler: (this: ADODB.Connection, parameter: {RecordsAffected: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command,
-         pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, event: 'InfoMessage', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
-         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, event: 'RollbackTransComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {pError: ADODB.Error,
-         adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, event: 'WillConnect', argNames: ['ConnectionString', 'UserID', 'Password', 'Options', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection,
-         parameter: {ConnectionString: string, UserID: string, Password: string, Options: number, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Connection, event: 'WillExecute', argNames: ['Source', 'CursorType', 'LockType', 'Options', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'],
-         handler: (this: ADODB.Connection, parameter: {Source: string, CursorType: ADODB.CursorTypeEnum, LockType: ADODB.LockTypeEnum, Options: number,
-         adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
-    on(obj: ADODB.Recordset, event: 'EndOfRecordset', argNames: ['fMoreData', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {fMoreData: boolean,
-         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'FetchComplete', argNames: ['pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {pError: ADODB.Error,
-         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'FetchProgress', argNames: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {Progress: number,
-         MaxProgress: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'FieldChangeComplete', argNames: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+    on(obj: ADODB.Connection, event: 'Disconnect', argNames: ['adStatus', 'pConnection'], handler: (
+        this: ADODB.Connection, parameter: {
+        adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'ExecuteComplete', argNames: ['RecordsAffected', 'pError', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'], handler: (
+        this: ADODB.Connection, parameter: {
+        RecordsAffected: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command, pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'InfoMessage' | 'CommitTransComplete' | 'RollbackTransComplete' | 'ConnectComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (
+        this: ADODB.Connection, parameter: {
+        pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'WillConnect', argNames: ['ConnectionString', 'UserID', 'Password', 'Options', 'adStatus', 'pConnection'], handler: (
+        this: ADODB.Connection, parameter: {
+        ConnectionString: string, UserID: string, Password: string, Options: number, adStatus: ADODB.EventStatusEnum, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'WillExecute', argNames: ['Source', 'CursorType', 'LockType', 'Options', 'adStatus', 'pCommand', 'pRecordset', 'pConnection'], handler: (
+        this: ADODB.Connection, parameter: {
+        Source: string, CursorType: ADODB.CursorTypeEnum, LockType: ADODB.LockTypeEnum, Options: number, adStatus: ADODB.EventStatusEnum, pCommand: ADODB.Command,
+        pRecordset: ADODB.Recordset, pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Recordset, event: 'EndOfRecordset', argNames: ['fMoreData', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
+        fMoreData: boolean, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FetchComplete', argNames: ['pError', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
+        pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FetchProgress', argNames: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
+        Progress: number, MaxProgress: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FieldChangeComplete', argNames: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
         cFields: number, Fields: any, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'MoveComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
-        adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'RecordChangeComplete', argNames: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+    on(obj: ADODB.Recordset, event: 'RecordChangeComplete', argNames: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
         adReason: ADODB.EventReasonEnum, cRecords: number, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'RecordsetChangeComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+    on(obj: ADODB.Recordset, event: 'RecordsetChangeComplete' | 'MoveComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
         adReason: ADODB.EventReasonEnum, pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'WillChangeField', argNames: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {cFields: number,
-         Fields: any, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'WillChangeRecord', argNames: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+    on(obj: ADODB.Recordset, event: 'WillChangeField', argNames: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
+        cFields: number, Fields: any, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeRecord', argNames: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
         adReason: ADODB.EventReasonEnum, cRecords: number, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'WillChangeRecordset', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {
+    on(obj: ADODB.Recordset, event: 'WillChangeRecordset' | 'WillMove', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (
+        this: ADODB.Recordset, parameter: {
         adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
-    on(obj: ADODB.Recordset, event: 'WillMove', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {adReason: ADODB.EventReasonEnum,
-         adStatus: ADODB.EventStatusEnum, pRecordset: ADODB.Recordset}) => void): void;
     set(obj: ADODB.Recordset, propertyName: 'Collect', parameterTypes: [any], newValue: any): void;
     new(progid: 'ADODB.Command'): ADODB.Command;
     new(progid: 'ADODB.Connection'): ADODB.Connection;
@@ -1001,4 +1004,4 @@ interface EnumeratorConstructor {
     new(col: ADODB.Fields): ADODB.Field;
     new(col: ADODB.Parameters): ADODB.Parameter;
     new(col: ADODB.Properties): ADODB.Property;
-}
\ No newline at end of file
+}
diff --git a/types/activex-adodb/tsconfig.json b/types/activex-adodb/tsconfig.json
index 01ef1659e1..484faf1ed0 100644
--- a/types/activex-adodb/tsconfig.json
+++ b/types/activex-adodb/tsconfig.json
@@ -2,7 +2,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["scripthost"],
+        "lib": ["es5", "scripthost"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/activex-scripting/activex-scripting-tests.ts b/types/activex-scripting/activex-scripting-tests.ts
index 6b460f6347..cc14a421ff 100644
--- a/types/activex-scripting/activex-scripting-tests.ts
+++ b/types/activex-scripting/activex-scripting-tests.ts
@@ -1,8 +1,7 @@
-//source -- https://msdn.microsoft.com/en-us/library/ebkhfaaz.aspx
+// source -- https://msdn.microsoft.com/en-us/library/ebkhfaaz.aspx
 
-
-//Generates a string describing the drive type of a given Drive object.
-var showDriveType = (drive: Scripting.Drive) => {
+// Generates a string describing the drive type of a given Drive object.
+let showDriveType = (drive: Scripting.Drive) => {
     switch (drive.DriveType) {
         case Scripting.DriveTypeConst.Removable:
             return 'Removeable';
@@ -19,14 +18,13 @@ var showDriveType = (drive: Scripting.Drive) => {
     }
 };
 
-
-//Generates a string describing the attributes of a file or folder.
-var showFileAttributes = (file: Scripting.File) => {
-    var attr = file.Attributes;
+// Generates a string describing the attributes of a file or folder.
+let showFileAttributes = (file: Scripting.File) => {
+    let attr = file.Attributes;
     if (attr === 0) {
         return 'Normal';
     }
-    var attributeStrings: string[] = [];
+    let attributeStrings: string[] = [];
     if (attr & Scripting.FileAttribute.Directory) { attributeStrings.push('Directory'); }
     if (attr & Scripting.FileAttribute.ReadOnly) { attributeStrings.push('Read-only'); }
     if (attr & Scripting.FileAttribute.Hidden) { attributeStrings.push('Hidden'); }
@@ -38,27 +36,25 @@ var showFileAttributes = (file: Scripting.File) => {
     return attributeStrings.join(',');
 };
 
-
-//source --https://msdn.microsoft.com/en-us/library/ts2t8ybh(v=vs.84).aspx
-var showFreeSpace = (drvPath: string) => {
-    var fso = new ActiveXObject('Scripting.FileSystemObject');
-    var d = fso.GetDrive(fso.GetDriveName(drvPath));
-    var s = 'Drive ' + drvPath + ' - ';
+// source --https://msdn.microsoft.com/en-us/library/ts2t8ybh(v=vs.84).aspx
+let showFreeSpace = (drvPath: string) => {
+    let fso = new ActiveXObject('Scripting.FileSystemObject');
+    let d = fso.GetDrive(fso.GetDriveName(drvPath));
+    let s = 'Drive ' + drvPath + ' - ';
     s += d.VolumeName + '<br>';
     s += 'Free Space: ' + d.FreeSpace / 1024 + ' Kbytes';
     return (s);
 };
 
+// source -- https://msdn.microsoft.com/en-us/library/kaf6yaft(v=vs.84).aspx
+let getALine = (filespec: string) => {
+    let fso = new ActiveXObject('Scripting.FileSystemObject');
+    let file = fso.OpenTextFile(filespec, Scripting.IOMode.ForReading, false);
 
-//source -- https://msdn.microsoft.com/en-us/library/kaf6yaft(v=vs.84).aspx
-var getALine = (filespec: string) => {
-    var fso = new ActiveXObject('Scripting.FileSystemObject');
-    var file = fso.OpenTextFile(filespec, Scripting.IOMode.ForReading, false);
-
-    var s = '';
+    let s = '';
     while (!file.AtEndOfLine) {
         s += file.Read(1);
     }
     file.Close();
     return (s);
-};
\ No newline at end of file
+};
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index 1dd659fc7a..e1af9535fd 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -4,6 +4,38 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Scripting {
+    const enum __MIDL___MIDL_itf_scrrun_0000_0000_0001 {
+        Alias = 1024,
+        Archive = 32,
+        Compressed = 2048,
+        Directory = 16,
+        Hidden = 2,
+        Normal = 0,
+        ReadOnly = 1,
+        System = 4,
+        Volume = 8
+    }
+
+    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0001 {
+        CDRom = 4,
+        Fixed = 2,
+        RamDisk = 5,
+        Remote = 3,
+        Removable = 1,
+        UnknownType = 0
+    }
+
+    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0002 {
+        SystemFolder = 1,
+        TemporaryFolder = 2,
+        WindowsFolder = 0
+    }
+
+    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0003 {
+        StdErr = 2,
+        StdIn = 0,
+        StdOut = 1
+    }
 
     const enum CompareMethod {
         BinaryCompare = 0,
@@ -59,268 +91,261 @@ declare namespace Scripting {
 
     /** Scripting.Dictionary */
     interface Dictionary {
-        
         /** Add a new key and item to the dictionary. */
         Add(Key: any, Item: any): void;
-        
+
         /** Set or get the string comparison method. */
         CompareMode: CompareMethod;
-        
+
         /** Get the number of items in the dictionary. */
         readonly Count: number;
-        
+
         /** Determine if a given key is in the dictionary. */
         Exists(Key: any): boolean;
         HashVal(Key: any): any;
-        
+
         /** Set or get the item for a given key */
         Item(Key: any): any;
-        
+
         /** Get an array containing all items in the dictionary. */
         Items(): any;
-        
+
         /** Change a key to a different key. */
         Key(Key: any): any;
-        
+
         /** Get an array containing all keys in the dictionary. */
         Keys(): any;
-        
+
         /** Remove a given key from the dictionary. */
         Remove(Key: any): void;
-        
+
         /** Remove all information from the dictionary. */
         RemoveAll(): void;
     }
 
     /** Drive Object */
     interface Drive {
-        
         /** Get available space */
         readonly AvailableSpace: any;
-        
+
         /** Drive letter */
         readonly DriveLetter: string;
-        
+
         /** Drive type */
         readonly DriveType: DriveTypeConst;
-        
+
         /** Filesystem type */
         readonly FileSystem: string;
-        
+
         /** Get drive free space */
         readonly FreeSpace: any;
-        
+
         /** Check if disk is available */
         readonly IsReady: boolean;
-        
+
         /** Path */
         readonly Path: string;
-        
+
         /** Root folder */
         readonly RootFolder: Folder;
-        
+
         /** Serial number */
         readonly SerialNumber: number;
-        
+
         /** Share name */
         readonly ShareName: string;
-        
+
         /** Get total drive size */
         readonly TotalSize: any;
-        
+
         /** Name of volume */
         VolumeName: string;
     }
 
     /** Collection of drives associated with drive letters */
     interface Drives {
-        
         /** Number of drives */
         readonly Count: number;
-        
+
         /** Get drive */
         Item(Key: any): Drive;
     }
 
     /** Script Encoder Object */
     interface Encoder {
-        
         /** Call the Encoder determined by szExt, passing bstrStreamIn and optional arguments */
         EncodeScriptFile(szExt: string, bstrStreamIn: string, cFlags: number, bstrDefaultLang: string): string;
     }
 
     /** File object */
     interface File {
-        
         /** File attributes */
         Attributes: FileAttribute;
-        
+
         /**
          * Copy this file
          * @param boolean [OverWriteFiles=true]
          */
         Copy(Destination: string, OverWriteFiles?: boolean): void;
-        
+
         /** Date file was created */
         readonly DateCreated: VarDate;
-        
+
         /** Date file was last accessed */
         readonly DateLastAccessed: VarDate;
-        
+
         /** Date file was last modified */
         readonly DateLastModified: VarDate;
-        
+
         /**
          * Delete this file
          * @param boolean [Force=false]
          */
         Delete(Force?: boolean): void;
-        
+
         /** Get drive that contains file */
         readonly Drive: Drive;
-        
+
         /** Move this file */
         Move(Destination: string): void;
-        
+
         /** Get name of file */
         Name: string;
-        
+
         /**
          * Open a file as a TextStream
          * @param Scripting.IOMode [IOMode=1]
          * @param Scripting.Tristate [Format=0]
          */
         OpenAsTextStream(IOMode?: IOMode, Format?: Tristate): TextStream;
-        
+
         /** Get folder that contains file */
         readonly ParentFolder: Folder;
-        
+
         /** Path to the file */
         readonly Path: string;
-        
+
         /** Short name */
         readonly ShortName: string;
-        
+
         /** Short path */
         readonly ShortPath: string;
-        
+
         /** File size */
         readonly Size: any;
-        
+
         /** Type description */
         readonly Type: string;
     }
 
     /** Collection of files in a folder */
     interface Files {
-        
         /** Number of folders */
         readonly Count: number;
-        
+
         /** Get file */
         Item(Key: any): File;
     }
 
     /** FileSystem Object */
     interface FileSystemObject {
-        
         /** Generate a path from an existing path and a name */
         BuildPath(Path: string, Name: string): string;
-        
+
         /**
          * Copy a file
          * @param boolean [OverWriteFiles=true]
          */
         CopyFile(Source: string, Destination: string, OverWriteFiles?: boolean): void;
-        
+
         /**
          * Copy a folder
          * @param boolean [OverWriteFiles=true]
          */
         CopyFolder(Source: string, Destination: string, OverWriteFiles?: boolean): void;
-        
+
         /** Create a folder */
         CreateFolder(Path: string): Folder;
-        
+
         /**
          * Create a file as a TextStream
          * @param boolean [Overwrite=true]
          * @param boolean [Unicode=false]
          */
         CreateTextFile(FileName: string, Overwrite?: boolean, Unicode?: boolean): TextStream;
-        
+
         /**
          * Delete a file
          * @param boolean [Force=false]
          */
         DeleteFile(FileSpec: string, Force?: boolean): void;
-        
+
         /**
          * Delete a folder
          * @param boolean [Force=false]
          */
         DeleteFolder(FolderSpec: string, Force?: boolean): void;
-        
+
         /** Check if a drive or a share exists */
         DriveExists(DriveSpec: string): boolean;
-        
+
         /** Get drives collection */
         readonly Drives: Drives;
-        
+
         /** Check if a file exists */
         FileExists(FileSpec: string): boolean;
-        
+
         /** Check if a path exists */
         FolderExists(FolderSpec: string): boolean;
-        
+
         /** Return the canonical representation of the path */
         GetAbsolutePathName(Path: string): string;
-        
+
         /** Return base name from a path */
         GetBaseName(Path: string): string;
-        
+
         /** Get drive or UNC share */
         GetDrive(DriveSpec: string): Drive;
-        
+
         /** Return drive from a path */
         GetDriveName(Path: string): string;
-        
+
         /** Return extension from path */
         GetExtensionName(Path: string): string;
-        
+
         /** Get file */
         GetFile(FilePath: string): File;
-        
+
         /** Return the file name from a path */
         GetFileName(Path: string): string;
-        
+
         /** Retrieve the file version of the specified file into a string */
         GetFileVersion(FileName: string): string;
-        
+
         /** Get folder */
         GetFolder(FolderPath: string): Folder;
-        
+
         /** Return path to the parent folder */
         GetParentFolderName(Path: string): string;
-        
+
         /** Get location of various system folders */
         GetSpecialFolder(SpecialFolder: SpecialFolderConst): Folder;
-        
+
         /**
          * Retrieve the standard input, output or error stream
          * @param boolean [Unicode=false]
          */
         GetStandardStream(StandardStreamType: StandardStreamTypes, Unicode?: boolean): TextStream;
-        
+
         /** Generate name that can be used to name a temporary file */
         GetTempName(): string;
-        
+
         /** Move a file */
         MoveFile(Source: string, Destination: string): void;
-        
+
         /** Move a folder */
         MoveFolder(Source: string, Destination: string): void;
-        
+
         /**
          * Open a file as a TextStream
          * @param Scripting.IOMode [IOMode=1]
@@ -332,134 +357,130 @@ declare namespace Scripting {
 
     /** Folder object */
     interface Folder {
-        
         /** Folder attributes */
         Attributes: FileAttribute;
-        
+
         /**
          * Copy this folder
          * @param boolean [OverWriteFiles=true]
          */
         Copy(Destination: string, OverWriteFiles?: boolean): void;
-        
+
         /**
          * Create a file as a TextStream
          * @param boolean [Overwrite=true]
          * @param boolean [Unicode=false]
          */
         CreateTextFile(FileName: string, Overwrite?: boolean, Unicode?: boolean): TextStream;
-        
+
         /** Date folder was created */
         readonly DateCreated: VarDate;
-        
+
         /** Date folder was last accessed */
         readonly DateLastAccessed: VarDate;
-        
+
         /** Date folder was last modified */
         readonly DateLastModified: VarDate;
-        
+
         /**
          * Delete this folder
          * @param boolean [Force=false]
          */
         Delete(Force?: boolean): void;
-        
+
         /** Get drive that contains folder */
         readonly Drive: Drive;
-        
+
         /** Get files collection */
         readonly Files: Files;
-        
+
         /** True if folder is root */
         readonly IsRootFolder: boolean;
-        
+
         /** Move this folder */
         Move(Destination: string): void;
-        
+
         /** Get name of folder */
         Name: string;
-        
+
         /** Get parent folder */
         readonly ParentFolder: Folder;
-        
+
         /** Path to folder */
         readonly Path: string;
-        
+
         /** Short name */
         readonly ShortName: string;
-        
+
         /** Short path */
         readonly ShortPath: string;
-        
+
         /** Sum of files and subfolders */
         readonly Size: any;
-        
+
         /** Get folders collection */
         readonly SubFolders: Folders;
-        
+
         /** Type description */
         readonly Type: string;
     }
 
     /** Collection of subfolders in a folder */
     interface Folders {
-        
         /** Create a new folder */
         Add(Name: string): Folder;
-        
+
         /** Number of folders */
         readonly Count: number;
-        
+
         /** Get folder */
         Item(Key: any): Folder;
     }
 
     /** TextStream object */
     interface TextStream {
-        
         /** Is the current position at the end of a line? */
         readonly AtEndOfLine: boolean;
-        
+
         /** Is the current position at the end of the stream? */
         readonly AtEndOfStream: boolean;
-        
+
         /** Close a text stream */
         Close(): void;
-        
+
         /** Current column number */
         readonly Column: number;
-        
+
         /** Current line number */
         readonly Line: number;
-        
+
         /** Read a specific number of characters into a string */
         Read(Characters: number): string;
-        
+
         /** Read the entire stream into a string */
         ReadAll(): string;
-        
+
         /** Read an entire line into a string */
         ReadLine(): string;
-        
+
         /** Skip a specific number of characters */
         Skip(Characters: number): void;
-        
+
         /** Skip a line */
         SkipLine(): void;
-        
+
         /** Write a string to the stream */
         Write(Text: string): void;
-        
+
         /** Write a number of blank lines to the stream */
         WriteBlankLines(Lines: number): void;
-        
+
         /**
          * Write a string and an end of line to the stream
          * @param string [Text='']
          */
         WriteLine(Text?: string): void;
     }
-
 }
 
 interface ActiveXObject {
@@ -474,4 +495,4 @@ interface EnumeratorConstructor {
     new(col: Scripting.Drives): Scripting.Drive;
     new(col: Scripting.Files): Scripting.File;
     new(col: Scripting.Folders): Scripting.Folder;
-}
\ No newline at end of file
+}
diff --git a/types/activex-scripting/tsconfig.json b/types/activex-scripting/tsconfig.json
index 454fc20695..190e7bdcd6 100644
--- a/types/activex-scripting/tsconfig.json
+++ b/types/activex-scripting/tsconfig.json
@@ -2,7 +2,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["scripthost"],
+        "lib": ["es5", "scripthost"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index e775ec9239..e7e2fcd506 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -1,31 +1,28 @@
-//source -- https://msdn.microsoft.com/en-us/library/windows/desktop/ms630826(v=vs.85).aspx
+// source -- https://msdn.microsoft.com/en-us/library/windows/desktop/ms630826(v=vs.85).aspx
 
-
-//Convert a file
-var commonDialog = new ActiveXObject('WIA.CommonDialog');
-var img = commonDialog.ShowAcquireImage();
+// Convert a file
+let commonDialog = new ActiveXObject('WIA.CommonDialog');
+let img = commonDialog.ShowAcquireImage();
 if (img.FormatID !== WIA.FormatID.wiaFormatJPEG) {
-    var ip = new ActiveXObject('WIA.ImageProcess');
+    let ip = new ActiveXObject('WIA.ImageProcess');
     ip.Filters.Add(ip.FilterInfos.Item('Convert').FilterID);
     ip.Filters.Item(1).Properties.Item('FormatID').Value = WIA.FormatID.wiaFormatJPEG;
     img = ip.Apply(img);
 }
 
-
-//Take a picture
-var dev = commonDialog.ShowSelectDevice();
+// Take a picture
+let dev = commonDialog.ShowSelectDevice();
 if (dev.Type === WIA.WiaDeviceType.CameraDeviceType) {
-    var itm = dev.ExecuteCommand(WIA.CommandID.wiaCommandTakePicture);
+    let itm = dev.ExecuteCommand(WIA.CommandID.wiaCommandTakePicture);
 }
 
-
-//Display detailed property information
+// Display detailed property information
 dev = commonDialog.ShowSelectDevice();
-var e = new Enumerator<WIA.Property>(dev.Properties);  //no foreach over ActiveX collections
+let e = new Enumerator<WIA.Property>(dev.Properties);  // no foreach over ActiveX collections
 e.moveFirst();
 while (!e.atEnd()) {
-    var p = e.item();
-    var s = p.Name + ' (' + p.PropertyID + ') = ';
+    let p = e.item();
+    let s = p.Name + ' (' + p.PropertyID + ') = ';
     if (p.IsVector) {
         s += '[vector of data]';
     } else {
@@ -48,8 +45,8 @@ while (!e.atEnd()) {
                 } else {
                     s += ' [valid values include: ';
                 }
-                var count = p.SubTypeValues.Count;
-                for (var i = 1; i <= count; i++) {
+                let count = p.SubTypeValues.Count;
+                for (let i = 1; i <= count; i++) {
                     s += p.SubTypeValues.Item(i);
                     if (i < count) {
                         s += ', ';
@@ -64,4 +61,4 @@ while (!e.atEnd()) {
     }
 
     WScript.Echo(s);
-}
\ No newline at end of file
+}
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index 564b7fbf04..ff7253c335 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace WIA {
-
     /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */
     const enum CommandID {
         wiaCommandChangeDocument = '{04E725B0-ACAE-11D2-A093-00C04F72DC3C}',
@@ -46,7 +45,10 @@ declare namespace WIA {
         wiaIDUnknown = '{00000000-0000-0000-0000-000000000000}'
     }
 
-    /** The WiaDeviceType enumeration specifies the type of device attached to a user's computer. Use the Type property on the DeviceInfo object or the Device object to obtain these values from the device. */
+    /**
+     * The WiaDeviceType enumeration specifies the type of device attached to a user's computer. Use the Type property on the DeviceInfo object or the Device
+     *  object to obtain these values from the device.
+     */
     const enum WiaDeviceType {
         CameraDeviceType = 2,
         ScannerDeviceType = 1,
@@ -54,7 +56,10 @@ declare namespace WIA {
         VideoDeviceType = 3
     }
 
-    /** A DeviceEvent's type is composed of bits from the WiaEventFlags enumeration. You can test a DeviceEvent's type by using the AND operation with DeviceEvent.Type and a member from the WiaEventFlags enumeration. */
+    /**
+     * A DeviceEvent's type is composed of bits from the WiaEventFlags enumeration. You can test a DeviceEvent's type by using the AND operation with DeviceEv
+     * ent.Type and a member from the WiaEventFlags enumeration.
+     */
     const enum WiaEventFlag {
         ActionEvent = 2,
         NotificationEvent = 1
@@ -74,7 +79,10 @@ declare namespace WIA {
         UnspecifiedIntent = 0
     }
 
-    /** The WiaImagePropertyType enumeration specifies the type of the value of an image property. Image properties can be found in the Properties collection of an ImageFile object. */
+    /**
+     * The WiaImagePropertyType enumeration specifies the type of the value of an image property. Image properties can be found in the Properties collection o
+     * f an ImageFile object.
+     */
     const enum WiaImagePropertyType {
         ByteImagePropertyType = 1001,
         LongImagePropertyType = 1004,
@@ -93,7 +101,10 @@ declare namespace WIA {
         VectorOfUnsignedRationalsImagePropertyType = 1106
     }
 
-    /** An Item's type is composed of bits from the WiaItemFlags enumeration. You can test an Item's type by using the AND operation with Item.Properties("Item Flags") and a member from the WiaItemFlags enumeration. */
+    /**
+     * An Item's type is composed of bits from the WiaItemFlags enumeration. You can test an Item's type by using the AND operation with Item.Properties("Item
+     *  Flags") and a member from the WiaItemFlags enumeration.
+     */
     const enum WiaItemFlag {
         AnalyzeItemFlag = 16,
         AudioItemFlag = 32,
@@ -116,7 +127,10 @@ declare namespace WIA {
         VPanoramaItemFlag = 1024
     }
 
-    /** The WiaPropertyType enumeration specifies the type of the value of an item property. Item properties can be found in the Properties collection of a Device or Item object. */
+    /**
+     * The WiaPropertyType enumeration specifies the type of the value of an item property. Item properties can be found in the Properties collection of a Dev
+     * ice or Item object.
+     */
     const enum WiaPropertyType {
         BooleanPropertyType = 1,
         BytePropertyType = 2,
@@ -157,7 +171,10 @@ declare namespace WIA {
         VectorOfVariantsPropertyType = 119
     }
 
-    /** The WiaSubType enumeration specifies more detail about the property value. Use the SubType property on the Property object to obtain these values for the property. */
+    /**
+     * The WiaSubType enumeration specifies more detail about the property value. Use the SubType property on the Property object to obtain these values for t
+     * he property.
+     */
     const enum WiaSubType {
         FlagSubType = 3,
         ListSubType = 2,
@@ -165,11 +182,14 @@ declare namespace WIA {
         UnspecifiedSubType = 0
     }
 
-    /** The CommonDialog control is an invisible-at-runtime control that contains all the methods that display a User Interface. A CommonDialog control can be created using "WIA.CommonDialog" in a call to CreateObject or by dropping a CommonDialog on a form. */
+    /**
+     * The CommonDialog control is an invisible-at-runtime control that contains all the methods that display a User Interface. A CommonDialog control can be
+     *  created using "WIA.CommonDialog" in a call to CreateObject or by dropping a CommonDialog on a form.
+     */
     interface CommonDialog {
-        
         /**
-         * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile object on success, otherwise Nothing
+         * Displays one or more dialog boxes that enable the user to acquire an image from a hardware device for image acquisition and returns an ImageFile object
+         *  on success, otherwise Nothing
          * @param WIA.WiaDeviceType [DeviceType=0]
          * @param WIA.WiaImageIntent [Intent=0]
          * @param WIA.WiaImageBias [Bias=131072]
@@ -178,36 +198,39 @@ declare namespace WIA {
          * @param boolean [UseCommonUI=true]
          * @param boolean [CancelError=false]
          */
-        ShowAcquireImage(DeviceType?: WiaDeviceType, Intent?: WiaImageIntent, Bias?: WiaImageBias, FormatID?: string, AlwaysSelectDevice?: boolean, UseCommonUI?: boolean, CancelError?: boolean): ImageFile;
-        
+        ShowAcquireImage(
+            DeviceType?: WiaDeviceType, Intent?: WiaImageIntent, Bias?: WiaImageBias, FormatID?: string, AlwaysSelectDevice?: boolean, UseCommonUI?: boolean, CancelError?: boolean): ImageFile;
+
         /** Launches the Windows Scanner and Camera Wizard and returns Nothing. Future versions may return a collection of ImageFile objects. */
         ShowAcquisitionWizard(Device: Device): any;
-        
+
         /**
          * Displays the properties dialog box for the specified Device
          * @param boolean [CancelError=false]
          */
         ShowDeviceProperties(Device: Device, CancelError?: boolean): void;
-        
+
         /**
          * Displays the properties dialog box for the specified Item
          * @param boolean [CancelError=false]
          */
         ShowItemProperties(Item: Item, CancelError?: boolean): void;
-        
+
         /** Launches the Photo Printing Wizard with the absolute path of a specific file or Vector of absolute paths to files */
         ShowPhotoPrintingWizard(Files: any): void;
-        
+
         /**
-         * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success, otherwise Nothing
+         * Displays a dialog box that enables the user to select a hardware device for image acquisition. Returns the selected Device object on success, otherwise
+         *  Nothing
          * @param WIA.WiaDeviceType [DeviceType=0]
          * @param boolean [AlwaysSelectDevice=false]
          * @param boolean [CancelError=false]
          */
         ShowSelectDevice(DeviceType?: WiaDeviceType, AlwaysSelectDevice?: boolean, CancelError?: boolean): Device;
-        
+
         /**
-         * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an Items collection on success, otherwise Nothing
+         * Displays a dialog box that enables the user to select an item for transfer from a hardware device for image acquisition. Returns the selection as an It
+         * ems collection on success, otherwise Nothing
          * @param WIA.WiaImageIntent [Intent=0]
          * @param WIA.WiaImageBias [Bias=131072]
          * @param boolean [SingleSelect=true]
@@ -215,7 +238,7 @@ declare namespace WIA {
          * @param boolean [CancelError=false]
          */
         ShowSelectItems(Device: Device, Intent?: WiaImageIntent, Bias?: WiaImageBias, SingleSelect?: boolean, UseCommonUI?: boolean, CancelError?: boolean): Items;
-        
+
         /**
          * Displays a progress dialog box while transferring the specified Item to the local machine. See Item.Transfer for additional information.
          * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
@@ -226,452 +249,489 @@ declare namespace WIA {
 
     /** The Device object represents an active connection to an imaging device. */
     interface Device {
-        
         /** A collection of all commands for this imaging device */
         readonly Commands: DeviceCommands;
-        
+
         /** Returns the DeviceID for this Device */
         readonly DeviceID: string;
-        
+
         /** A collection of all events for this imaging device */
         readonly Events: DeviceEvents;
-        
-        /** Issues the command specified by CommandID to the imaging device. CommandIDs are device dependent. Valid CommandIDs for this Device are contained in the Commands collection. */
+
+        /**
+         * Issues the command specified by CommandID to the imaging device. CommandIDs are device dependent. Valid CommandIDs for this Device are contained in the
+         *  Commands collection.
+         */
         ExecuteCommand(CommandID: string): Item;
-        
+
         /** Returns the Item object specified by ItemID if it exists */
         GetItem(ItemID: string): Item;
-        
+
         /** A collection of all items for this imaging device */
         readonly Items: Items;
-        
+
         /** A collection of all properties for this imaging device */
         readonly Properties: Properties;
-        
+
         /** Returns the Type of Device */
         readonly Type: WiaDeviceType;
-        
+
         /** Returns the underlying IWiaItem interface for this Device object */
         readonly WiaItem: any;
     }
 
     /** The DeviceCommand object describes a CommandID that can be used when calling ExecuteCommand on a Device or Item object. */
     interface DeviceCommand {
-        
         /** Returns the commandID for this Command */
         readonly CommandID: string;
-        
+
         /** Returns the command Description */
         readonly Description: string;
-        
+
         /** Returns the command Name */
         readonly Name: string;
     }
 
-    /** The DeviceCommands object is a collection of all the supported DeviceCommands for an imaging device. See the Commands property of a Device or Item object for more details on determining the collection of supported device commands. */
+    /**
+     * The DeviceCommands object is a collection of all the supported DeviceCommands for an imaging device. See the Commands property of a Device or Item obje
+     * ct for more details on determining the collection of supported device commands.
+     */
     interface DeviceCommands {
-        
         /** Returns the number of members in the collection */
         readonly Count: number;
-        
+
         /** Returns the specified item in the collection by position */
         Item(Index: number): DeviceCommand;
     }
 
     /** The DeviceEvent object describes an EventID that can be used when calling RegisterEvent or RegisterPersistentEvent on a DeviceManager object. */
     interface DeviceEvent {
-        
         /** Returns the event Description */
         readonly Description: string;
-        
+
         /** Returns the EventID for this Event */
         readonly EventID: string;
-        
+
         /** Returns the event Name */
         readonly Name: string;
-        
+
         /** Returns the Type of this Event */
         readonly Type: WiaEventFlag;
     }
 
-    /** The DeviceEvents object is a collection of all the supported DeviceEvent for an imaging device. See the Events property of a Device object for more details on determining the collection of supported device events. */
+    /**
+     * The DeviceEvents object is a collection of all the supported DeviceEvent for an imaging device. See the Events property of a Device object for more det
+     * ails on determining the collection of supported device events.
+     */
     interface DeviceEvents {
-        
         /** Returns the number of members in the collection */
         readonly Count: number;
-        
+
         /** Returns the specified item in the collection by position */
         Item(Index: number): DeviceEvent;
     }
 
-    /** The DeviceInfo object is a container that describes the unchanging (static) properties of an imaging device that is currently connected to the computer. */
+    /**
+     * The DeviceInfo object is a container that describes the unchanging (static) properties of an imaging device that is currently connected to the computer
+     * .
+     */
     interface DeviceInfo {
-        
         /** Establish a connection with this device and return a Device object */
         Connect(): Device;
-        
+
         /** Returns the DeviceID for this Device */
         readonly DeviceID: string;
-        
+
         /** A collection of all properties for this imaging device that are applicable when the device is not connected */
         readonly Properties: Properties;
-        
+
         /** Returns the Type of Device */
         readonly Type: WiaDeviceType;
     }
 
-    /** The DeviceInfos object is a collection of all the imaging devices currently connected to the computer. See the DeviceInfos property on the DeviceManager object for detail on accessing the DeviceInfos object. */
+    /**
+     * The DeviceInfos object is a collection of all the imaging devices currently connected to the computer. See the DeviceInfos property on the DeviceManage
+     * r object for detail on accessing the DeviceInfos object.
+     */
     interface DeviceInfos {
-        
         /** Returns the number of members in the collection */
         readonly Count: number;
-        
+
         /** Returns the specified item in the collection either by position or Device ID */
         Item(Index: any): DeviceInfo;
     }
 
-    /** The DeviceManager control is an invisible-at-runtime control that manages the imaging devices connected to the computer. A DeviceManager control can be created using "WIA.DeviceManager" in a call to CreateObject or by dropping a DeviceManager on a form. */
+    /**
+     * The DeviceManager control is an invisible-at-runtime control that manages the imaging devices connected to the computer. A DeviceManager control can be
+     *  created using "WIA.DeviceManager" in a call to CreateObject or by dropping a DeviceManager on a form.
+     */
     interface DeviceManager {
-        
         /** A collection of all imaging devices connected to this computer */
         readonly DeviceInfos: DeviceInfos;
-        
+
         /**
-         * Registers the specified EventID for the specified DeviceID. If DeviceID is "*" then OnEvent will be called whenever the event specified occurs for any device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
+         * Registers the specified EventID for the specified DeviceID. If DeviceID is "*" then OnEvent will be called whenever the event specified occurs for any
+         *  device. Otherwise, OnEvent will only be called if the event specified occurs on the device specified.
          * @param string [DeviceID='*']
          */
         RegisterEvent(EventID: string, DeviceID?: string): void;
-        
+
         /**
-         * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full path name and the appropriate command-line arguments needed to invoke the application.
+         * Registers the specified Command to launch when the specified EventID for the specified DeviceID occurs. Command can be either a ClassID or the full pat
+         * h name and the appropriate command-line arguments needed to invoke the application.
          * @param string [DeviceID='*']
          */
         RegisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
-        
+
         /**
-         * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called RegisterEvent.
+         * Unregisters the specified EventID for the specified DeviceID. UnregisterEvent should only be called for EventID and DeviceID for which you called Regis
+         * terEvent.
          * @param string [DeviceID='*']
          */
         UnregisterEvent(EventID: string, DeviceID?: string): void;
-        
+
         /**
-         * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the Command, Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
+         * Unregisters the specified Command for the specified EventID for the specified DeviceID. UnregisterPersistentEvent should only be called for the Command
+         * , Name, Description, Icon, EventID and DeviceID for which you called RegisterPersistentEvent.
          * @param string [DeviceID='*']
          */
         UnregisterPersistentEvent(Command: string, Name: string, Description: string, Icon: string, EventID: string, DeviceID?: string): void;
     }
 
-    /** The Filter object represents a unit of modification on an ImageFile. To use a Filter, add it to the Filters collection, then set the filter's properties and finally use the Apply method of the ImageProcess object to filter an ImageFile. */
+    /**
+     * The Filter object represents a unit of modification on an ImageFile. To use a Filter, add it to the Filters collection, then set the filter's propertie
+     * s and finally use the Apply method of the ImageProcess object to filter an ImageFile.
+     */
     interface Filter {
-        
         /** Returns a Description of what the filter does */
         readonly Description: string;
-        
+
         /** Returns the FilterID for this Filter */
         readonly FilterID: string;
-        
+
         /** Returns the Filter Name */
         readonly Name: string;
-        
+
         /** A collection of all properties for this filter */
         readonly Properties: Properties;
     }
 
-    /** The FilterInfo object is a container that describes a Filter object without requiring a Filter to be Added to the process chain. See the FilterInfos property on the ImageProcess object for details on accessing FilterInfo objects. */
+    /**
+     * The FilterInfo object is a container that describes a Filter object without requiring a Filter to be Added to the process chain. See the FilterInfos pr
+     * operty on the ImageProcess object for details on accessing FilterInfo objects.
+     */
     interface FilterInfo {
-        
         /** Returns a technical Description of what the filter does and how to use it in a filter chain */
         readonly Description: string;
-        
+
         /** Returns the FilterID for this filter */
         readonly FilterID: string;
-        
+
         /** Returns the FilterInfo Name */
         readonly Name: string;
     }
 
-    /** The FilterInfos object is a collection of all the available FilterInfo objects. See the FilterInfos property on the ImageProcess object for detail on accessing the FilterInfos object. */
+    /**
+     * The FilterInfos object is a collection of all the available FilterInfo objects. See the FilterInfos property on the ImageProcess object for detail on a
+     * ccessing the FilterInfos object.
+     */
     interface FilterInfos {
-        
         /** Returns the number of members in the collection */
         readonly Count: number;
-        
+
         /** Returns the specified item in the collection either by position or name */
         Item(Index: any): FilterInfo;
     }
 
     /** The Filters object is a collection of the Filters that will be applied to an ImageFile when you call the Apply method on the ImageProcess object. */
     interface Filters {
-        
         /**
          * Appends/Inserts a new Filter of the specified FilterID into a Filter collection
          * @param number [Index=0]
          */
         Add(FilterID: string, Index?: number): void;
-        
+
         /** Returns the number of members in the collection */
         readonly Count: number;
-        
+
         /** Returns the specified item in the collection by position or FilterID */
         Item(Index: number): Filter;
-        
+
         /** Removes the designated filter */
         Remove(Index: number): void;
     }
 
-    /** The Formats object is a collection of supported FormatIDs that you can use when calling Transfer on an Item object or ShowTransfer on a CommonDialog object for this Item. */
+    /**
+     * The Formats object is a collection of supported FormatIDs that you can use when calling Transfer on an Item object or ShowTransfer on a CommonDialog ob
+     * ject for this Item.
+     */
     interface Formats {
-        
         /** Returns the number of members in the collection */
         readonly Count: number;
-        
+
         /** Returns the specified item in the collection by position */
         Item(Index: number): string;
     }
 
-    /** The ImageFile object is a container for images transferred to your computer when you call Transfer or ShowTransfer. It also supports image files through LoadFile. An ImageFile object can be created using "WIA.ImageFile" in a call to CreateObject. */
+    /**
+     * The ImageFile object is a container for images transferred to your computer when you call Transfer or ShowTransfer. It also supports image files throug
+     * h LoadFile. An ImageFile object can be created using "WIA.ImageFile" in a call to CreateObject.
+     */
     interface ImageFile {
-        
         /** Returns/Sets the current frame in the image */
         ActiveFrame: number;
-        
+
         /** Returns the raw image bits as a Vector of Long values */
         readonly ARGBData: Vector;
-        
+
         /** Returns the raw image file as a Vector of Bytes */
         readonly FileData: Vector;
-        
+
         /** Returns the file extension for this image file type */
         readonly FileExtension: string;
-        
+
         /** Returns the FormatID for this file type */
         readonly FormatID: string;
-        
+
         /** Returns the number of frames in the image */
         readonly FrameCount: number;
-        
+
         /** Returns the Height of the image in pixels */
         readonly Height: number;
-        
+
         /** Returns the Horizontal pixels per inch of the image */
         readonly HorizontalResolution: number;
-        
+
         /** Indicates if the pixel format has an alpha component */
         readonly IsAlphaPixelFormat: boolean;
-        
+
         /** Indicates whether the image is animated */
         readonly IsAnimated: boolean;
-        
+
         /** Indicates if the pixel format is extended (16 bits/channel) */
         readonly IsExtendedPixelFormat: boolean;
-        
+
         /** Indicates if the pixel data is an index into a palette or the actual color data */
         readonly IsIndexedPixelFormat: boolean;
-        
+
         /** Loads the ImageFile object with the specified File */
         LoadFile(Filename: string): void;
-        
+
         /** Returns the depth of the pixels of the image in bits per pixel */
         readonly PixelDepth: number;
-        
+
         /** A collection of all properties for this image */
         readonly Properties: Properties;
-        
+
         /** Save the ImageFile object to the specified File */
         SaveFile(Filename: string): void;
-        
+
         /** Returns the Vertical pixels per inch of the image */
         readonly VerticalResolution: number;
-        
+
         /** Returns the Width of the image in pixels */
         readonly Width: number;
     }
 
     /** The ImageProcess object manages the filter chain. An ImageProcess object can be created using "WIA.ImageProcess" in a call to CreateObject. */
     interface ImageProcess {
-        
         /** Takes the specified ImageFile and returns the new ImageFile with all the filters applied on success */
         Apply(Source: ImageFile): ImageFile;
-        
+
         /** A collection of all available filters */
         readonly FilterInfos: FilterInfos;
-        
+
         /** A collection of the filters to be applied in this process */
         readonly Filters: Filters;
     }
 
-    /** The Item object is a container for an item on an imaging device object. See the Items property on the Device or Item object for details on accessing Item objects. */
+    /**
+     * The Item object is a container for an item on an imaging device object. See the Items property on the Device or Item object for details on accessing It
+     * em objects.
+     */
     interface Item {
-        
         /** A collection of all commands for this item */
         readonly Commands: DeviceCommands;
-        
+
         /** Issues the command specified by CommandID. CommandIDs are device dependent. Valid CommandIDs for this Item are contained in the Commands collection. */
         ExecuteCommand(CommandID: string): Item;
-        
+
         /** A collection of all supported format types for this item */
         readonly Formats: Formats;
-        
+
         /** Returns the ItemID for this Item */
         readonly ItemID: string;
-        
+
         /** A collection of all child items for this item */
         readonly Items: Items;
-        
+
         /** A collection of all properties for this item */
         readonly Properties: Properties;
-        
+
         /**
-         * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging device. Future versions may return a collection of ImageFile objects.
+         * Returns an ImageFile object, in this version, in the format specified in FormatID if supported, otherwise using the preferred format for this imaging d
+         * evice. Future versions may return a collection of ImageFile objects.
          * @param string [FormatID='{00000000-0000-0000-0000-000000000000}']
          */
         Transfer(FormatID?: string): any;
-        
+
         /** Returns the underlying IWiaItem interface for this Item object */
         readonly WiaItem: any;
     }
 
     /** The Items object contains a collection of Item objects. See the Items property on the Device or Item object for details on accessing the Items object. */
     interface Items {
-        
         /** Adds a new Item with the specified Name and Flags. The Flags value is created by using the OR operation with members of the WiaItemFlags enumeration. */
         Add(Name: string, Flags: number): void;
-        
+
         /** Returns the number of members in the collection */
         readonly Count: number;
-        
+
         /** Returns the specified item in the collection by position */
         Item(Index: number): Item;
-        
+
         /** Removes the designated Item */
         Remove(Index: number): void;
     }
 
-    /** The Properties object is a collection of all the Property objects associated with a given Device, DeviceInfo, Filter, ImageFile or Item object. See the Properties property on any of these objects for detail on accessing the Properties object. */
+    /**
+     * The Properties object is a collection of all the Property objects associated with a given Device, DeviceInfo, Filter, ImageFile or Item object. See the
+     *  Properties property on any of these objects for detail on accessing the Properties object.
+     */
     interface Properties {
-        
         /** Returns the number of members in the collection */
         readonly Count: number;
-        
+
         /** Indicates whether the specified Property exists in the collection */
         Exists(Index: any): boolean;
-        
+
         /** Returns the specified item in the collection either by position or name. */
         Item(Index: any): Property;
     }
 
-    /** The Property object is a container for a property associated with a Device, DeviceInfo, Filter, ImageFile or Item object. See the Properties property on any of these objects for details on accessing Property objects. */
+    /**
+     * The Property object is a container for a property associated with a Device, DeviceInfo, Filter, ImageFile or Item object. See the Properties property o
+     * n any of these objects for details on accessing Property objects.
+     */
     interface Property {
-        
         /** Indicates whether the Property Value is read only */
         readonly IsReadOnly: boolean;
-        
+
         /** Indicates whether the Property Value is a vector */
         readonly IsVector: boolean;
-        
+
         /** Returns the Property Name */
         readonly Name: string;
-        
+
         /** Returns the PropertyID of this Property */
         readonly PropertyID: number;
-        
+
         /** Returns the SubType of the Property, if any */
         readonly SubType: WiaSubType;
-        
+
         /** Returns the default Property Value if the SubType is not UnspecifiedSubType */
         readonly SubTypeDefault: any;
-        
+
         /** Returns the maximum valid Property Value if the SubType is RangeSubType */
         readonly SubTypeMax: number;
-        
+
         /** Returns the minimum valid Property Value if the SubType is RangeSubType */
         readonly SubTypeMin: number;
-        
+
         /** Returns the step increment of Property Values if the SubType is RangeSubType */
         readonly SubTypeStep: number;
-        
+
         /** Returns a Vector of valid Property Values if the SubType is ListSubType or valid flag Values that can be ored together if the SubType is FlagSubType */
         readonly SubTypeValues: Vector;
-        
+
         /** Returns either a WiaPropertyType or a WiaImagePropertyType */
         readonly Type: number;
-        
+
         /** Returns/Sets the Property Value */
         Value: any;
     }
 
-    /** The Rational object is a container for the rational values found in Exif tags. It is a supported element type of the Vector object and may be created using "WIA.Rational" in a call to CreateObject. */
+    /**
+     * The Rational object is a container for the rational values found in Exif tags. It is a supported element type of the Vector object and may be created u
+     * sing "WIA.Rational" in a call to CreateObject.
+     */
     interface Rational {
-        
         /** Returns/Sets the Rational Value Denominator */
         Denominator: number;
-        
+
         /** Returns/Sets the Rational Value Numerator */
         Numerator: number;
-        
+
         /** Returns the Rational Value as a Double */
         readonly Value: number;
     }
 
-    /** The Vector object is a collection of values of the same type. It is used throughout the library in many different ways. The Vector object may be created using "WIA.Vector" in a call to CreateObject. */
+    /**
+     * The Vector object is a collection of values of the same type. It is used throughout the library in many different ways. The Vector object may be create
+     * d using "WIA.Vector" in a call to CreateObject.
+     */
     interface Vector {
-        
         /**
-         * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the Vector collection.
+         * If Index is not zero, Inserts a new element into the Vector collection before the specified Index. If Index is zero, Appends a new element to the Vecto
+         * r collection.
          * @param number [Index=0]
          */
         Add(Value: any, Index?: number): void;
-        
+
         /** Returns/Sets the Vector of Bytes as an array of bytes */
         BinaryData: any;
-        
+
         /** Removes all elements. */
         Clear(): void;
-        
+
         /** Returns the number of members in the vector */
         readonly Count: number;
-        
+
         /** Returns/Sets the Vector of Integers from a Date */
         Date: VarDate;
-        
+
         /**
-         * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an ImageFile from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
+         * Used to get the Thumbnail property of an ImageFile which is an image file, The thumbnail property of an Item which is RGB data, or creating an ImageFil
+         * e from raw ARGB data. Returns an ImageFile object on success. See the Picture method for more details.
          * @param number [Width=0]
          * @param number [Height=0]
          */
         ImageFile(Width?: number, Height?: number): ImageFile;
-        
+
         /** Returns/Sets the specified item in the vector by position */
         Item(Index: number): any;
-        
+
         /**
-         * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs must be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
+         * If the Vector of Bytes contains an image file, then Width and Height are ignored. Otherwise a Vector of Bytes must be RGB data and a Vector of Longs mu
+         * st be ARGB data. Returns a Picture object on success. See the ImageFile method for more details.
          * @param number [Width=0]
          * @param number [Height=0]
          */
         Picture(Width?: number, Height?: number): any;
-        
+
         /** Removes the designated element and returns it if successful */
         Remove(Index: number): any;
-        
+
         /**
-         * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be stored as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
+         * Stores the string Value into the Vector of Bytes including the NULL terminator. Value may be truncated unless Resizable is True. The string will be sto
+         * red as an ANSI string unless Unicode is True, in which case it will be stored as a Unicode string.
          * @param boolean [Resizable=true]
          * @param boolean [Unicode=true]
          */
         SetFromString(Value: string, Resizable?: boolean, Unicode?: boolean): void;
-        
+
         /**
          * Returns a Vector of Bytes as a String
          * @param boolean [Unicode=true]
          */
         String(Unicode?: boolean): string;
     }
-
 }
 
 interface ActiveXObject {
-    on(obj: WIA.DeviceManager, eventName: 'OnEvent', eventArgs: ['EventID', 'DeviceID', 'ItemID'], handler: (this: WIA.DeviceManager, parameter: {EventID: string, DeviceID: string, ItemID: string}) => void): void;
+    on(obj: WIA.DeviceManager, event: 'OnEvent', argNames: ['EventID', 'DeviceID', 'ItemID'], handler: (
+        this: WIA.DeviceManager, parameter: {
+        EventID: string, DeviceID: string, ItemID: string}) => void): void;
     set(obj: WIA.Vector, propertyName: 'Item', parameterTypes: [number], newValue: any): void;
     new(progid: 'WIA.CommonDialog'): WIA.CommonDialog;
     new(progid: 'WIA.DeviceManager'): WIA.DeviceManager;
@@ -691,4 +751,4 @@ interface EnumeratorConstructor {
     new(col: WIA.Items): WIA.Item;
     new(col: WIA.Properties): WIA.Property;
     new(col: WIA.Vector): any;
-}
\ No newline at end of file
+}
diff --git a/types/activex-wia/tsconfig.json b/types/activex-wia/tsconfig.json
index 321e40e36c..b06917d12c 100644
--- a/types/activex-wia/tsconfig.json
+++ b/types/activex-wia/tsconfig.json
@@ -2,7 +2,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["scripthost"],
+        "lib": ["es5", "scripthost"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,

From 8959bd86fa8b729f7156fa4199b3ab47b09a50ff Mon Sep 17 00:00:00 2001
From: prakarshpandey <ppandey@g.hmc.edu>
Date: Tue, 27 Jun 2017 18:17:03 -0700
Subject: [PATCH 111/287] Created type definitions for react-app

---
 types/react-app/index.d.ts          | 40 +++++++++++++++++++++++++++++
 types/react-app/react-app-tests.tsx | 38 +++++++++++++++++++++++++++
 types/react-app/tsconfig.json       | 23 +++++++++++++++++
 types/react-app/tslint.json         |  1 +
 4 files changed, 102 insertions(+)
 create mode 100644 types/react-app/index.d.ts
 create mode 100644 types/react-app/react-app-tests.tsx
 create mode 100644 types/react-app/tsconfig.json
 create mode 100644 types/react-app/tslint.json

diff --git a/types/react-app/index.d.ts b/types/react-app/index.d.ts
new file mode 100644
index 0000000000..3fee3b6cf7
--- /dev/null
+++ b/types/react-app/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for react-app 1.0.0-alpha.3
+// Project: https://github.com/kriasoft/react-app#readme
+// Definitions by: Prakarsh Pandey <https://github.com/prakarshpandey>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export interface LinkProps {
+    to: string | object;
+    onClick?(): void;
+    className?: string;
+}
+
+export interface LayoutProps {
+    className: string;
+}
+
+export interface RouteProps { // takes the form of universal-router routes
+    path: string;
+    children: ChildProps[];
+}
+
+export interface ChildProps {
+    path: string;
+    action(params: any): object;
+}
+
+export interface CreateAppObject {
+    routes: RouteProps;
+    context: object;
+    container: Element | null;
+}
+
+// exporting the createApp function
+export function createApp(createAppObject: CreateAppObject): JSX.Element;
+
+export const Link: React.ComponentClass<LinkProps>;
+export const Layout: React.ComponentClass<LayoutProps>;
+export const Header: React.ComponentClass<{}>;
+export const Navigation: React.ComponentClass<{}>;
diff --git a/types/react-app/react-app-tests.tsx b/types/react-app/react-app-tests.tsx
new file mode 100644
index 0000000000..f19b436412
--- /dev/null
+++ b/types/react-app/react-app-tests.tsx
@@ -0,0 +1,38 @@
+import * as React from 'react';
+import { Navigation, Link, Layout, Header, createApp } from './index';
+
+const store = {};
+const routes = {
+    path: '/',
+    children: {
+        fooRoute: {
+            path = '/',
+            action() {
+                return {
+                    title: 'Foo Page',
+                    component: <h1>Foo!</h1>
+                };
+            }
+        },
+        barRoute: {
+            path: '/bar',
+            action() {
+                return {
+                    title: 'Bar Page',
+                    component: <h1>Bar!</h1>
+                };
+            }
+        }
+    }
+};
+
+<Link to="/bar" className="a-link"/>;
+<Layout className="my-layout"/>;
+<Header />;
+<Navigation />;
+
+createApp({
+    routes,
+    context: { store },
+    container: document.body
+});
diff --git a/types/react-app/tsconfig.json b/types/react-app/tsconfig.json
new file mode 100644
index 0000000000..3a673038be
--- /dev/null
+++ b/types/react-app/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-app-tests.ts"
+    ]
+}
diff --git a/types/react-app/tslint.json b/types/react-app/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-app/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1537db2e2e0bc8fa8ff41fdfd09c68fa84972f58 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Wed, 28 Jun 2017 03:22:13 +0200
Subject: [PATCH 112/287] Added Typescript Version to WIA, which uses string
 enums

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

diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index ff7253c335..51ef3c59f7 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms630368(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Typescript Version: 2.4
 
 declare namespace WIA {
     /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */

From f3b410c756d251d16c1c67910ec50f27d3c65d01 Mon Sep 17 00:00:00 2001
From: codemannz <codeman_nz@hotmail.com>
Date: Wed, 28 Jun 2017 13:27:24 +1200
Subject: [PATCH 113/287] Updated to Backbone.Model

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

diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 9ffe1460e9..ad623aa078 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -1272,7 +1272,7 @@ declare namespace Marionette {
         getRegion(): Region;
 
         /** Show a view in the root region */
-        showView(view: Backbone.View<TModel>): void;
+        showView(view: Backbone.View<Backbone.Model>): void;
 
         /** Get the view from the root region*/
         getView(): any;

From c93211a70694aee691a208933e73a3b055835aee Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Wed, 28 Jun 2017 03:37:33 +0200
Subject: [PATCH 114/287] Reverted changes to package.json

---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index efdebf7e3f..1be6d06c89 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,5 @@
   "devDependencies": {
     "dtslint": "Microsoft/dtslint#production",
     "types-publisher": "Microsoft/types-publisher#production"
-  },
-  "dependencies": {
-    "typescript": "^2.5.0-dev.20170627"
   }
 }

From 88fcc12c7a03a80d21e74d85c6dba9a4a0a73835 Mon Sep 17 00:00:00 2001
From: clarenceh <ho.clarence@gmail.com>
Date: Wed, 28 Jun 2017 10:22:22 +0800
Subject: [PATCH 115/287] Updated Table interface's save operation signature
 (for accepting object only)

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

diff --git a/types/massive/index.d.ts b/types/massive/index.d.ts
index 8d6c251b07..b7132ab910 100644
--- a/types/massive/index.d.ts
+++ b/types/massive/index.d.ts
@@ -51,7 +51,6 @@ declare namespace massive {
     where(query: string, params: any[] | object): Promise<T[]>;
     search(criteria: SearchCriteria, queryOptions?: QueryOptions): Promise<any>;
     save(data: object): Promise<T>;
-    save(data: object[]): Promise<T[]>;
     insert(data: object): Promise<T>;
     insert(data: object[]): Promise<T[]>;
     update(dataOrCriteria: object, changesMap?: object): Promise<T>;

From b66d4b85f0d72e001eb4978a6a6c5bb23bcee374 Mon Sep 17 00:00:00 2001
From: hjin-me <hjin.me@gmail.com>
Date: Wed, 28 Jun 2017 10:43:10 +0800
Subject: [PATCH 116/287] add missing MaterialParameters

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

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 02cbe672e8..7a6a6ec9ac 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -2318,6 +2318,9 @@ export interface MaterialParameters {
     lights?: boolean;
     shading?: Shading;
     vertexColors?: Colors;
+    clippingPlanes?: Plane[];
+    clipIntersection?: boolean;
+    clipShadows?: boolean;
 }
 
 /**

From 1205f064bd7fc3fed402f0dd681560525a8fe2cd Mon Sep 17 00:00:00 2001
From: kimu_shu <alfvegardrisc@gmail.com>
Date: Wed, 28 Jun 2017 11:58:01 +0900
Subject: [PATCH 117/287] Add fs.writeFileSync overloads and tests

---
 types/node/index.d.ts       | 1 +
 types/node/node-tests.ts    | 3 +++
 types/node/v0/node-tests.ts | 2 ++
 types/node/v4/index.d.ts    | 1 +
 types/node/v4/node-tests.ts | 3 +++
 types/node/v6/index.d.ts    | 1 +
 types/node/v6/node-tests.ts | 3 +++
 types/node/v7/index.d.ts    | 1 +
 types/node/v7/node-tests.ts | 3 +++
 9 files changed, 18 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 7691c2c9af..9e69aca71e 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2835,6 +2835,7 @@ declare module "fs" {
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index aeefc2bbdc..0297bc375b 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -169,6 +169,9 @@ namespace fs_tests {
                 encoding: "ascii"
             },
             assert.ifError);
+
+        fs.writeFileSync("testfile", "content", "utf8");
+        fs.writeFileSync("testfile", "content", { encoding: "utf8" });
     }
 
     {
diff --git a/types/node/v0/node-tests.ts b/types/node/v0/node-tests.ts
index 30dfd2bd72..8bb4ac371d 100644
--- a/types/node/v0/node-tests.ts
+++ b/types/node/v0/node-tests.ts
@@ -47,6 +47,8 @@ fs.writeFile("Harry Potter",
     },
     assert.ifError);
 
+fs.writeFileSync("testfile", "content", { encoding: "utf8" });
+
 var content: string,
     buffer: Buffer;
 
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 3c5a7745e9..30b40dc2f0 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -1775,6 +1775,7 @@ declare module "fs" {
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index b56bb224e1..247f6969ea 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -151,6 +151,9 @@ namespace fs_tests {
                 encoding: "ascii"
             },
             assert.ifError);
+
+        fs.writeFileSync("testfile", "content", "utf8");
+        fs.writeFileSync("testfile", "content", { encoding: "utf8" });
     }
 
     {
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index d0c3a44311..21c363e95a 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -2564,6 +2564,7 @@ declare module "fs" {
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index f7474844e8..057e0858e7 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -168,6 +168,9 @@ namespace fs_tests {
                 encoding: "ascii"
             },
             assert.ifError);
+
+        fs.writeFileSync("testfile", "content", "utf8");
+        fs.writeFileSync("testfile", "content", { encoding: "utf8" });
     }
 
     {
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 31e068cec8..b9763c08fc 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -2693,6 +2693,7 @@ declare module "fs" {
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index de401eb0fc..67b6d9f26f 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -169,6 +169,9 @@ namespace fs_tests {
                 encoding: "ascii"
             },
             assert.ifError);
+
+        fs.writeFileSync("testfile", "content", "utf8");
+        fs.writeFileSync("testfile", "content", { encoding: "utf8" });
     }
 
     {

From 52d5284ed21d46b0007006e7b550a30e804562cd Mon Sep 17 00:00:00 2001
From: Melvin Lee <zy@zy.sg>
Date: Wed, 28 Jun 2017 11:46:08 +0800
Subject: [PATCH 118/287] Set return type for serializeDate to string

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

diff --git a/types/qs/index.d.ts b/types/qs/index.d.ts
index b4f27c1304..d3574383a5 100644
--- a/types/qs/index.d.ts
+++ b/types/qs/index.d.ts
@@ -20,7 +20,7 @@ declare namespace QueryString {
         arrayFormat?: 'indices' | 'brackets' | 'repeat';
         indices?: boolean;
         sort?: (a: any, b: any) => number;
-        serializeDate?: (d: Date) => any;
+        serializeDate?: (d: Date) => string;
         format?: 'RFC1738' | 'RFC3986';
         encodeValuesOnly?: boolean;
     }
diff --git a/types/qs/qs-tests.ts b/types/qs/qs-tests.ts
index 3d21daa46c..d71aa55957 100644
--- a/types/qs/qs-tests.ts
+++ b/types/qs/qs-tests.ts
@@ -258,7 +258,7 @@ qs.parse('a=b&c=d', { delimiter: '&' });
 () => {
     var date = new Date(7);
     assert.equal(
-        qs.stringify({ a: date }, { serializeDate: function (d) { return d.getTime(); } }),
+        qs.stringify({ a: date }, { serializeDate: function (d) { return d.getTime().toString(); } }),
         'a=7'
     );
 }

From ee116c70dbbc4be09ddc89274a477b59bb26ce26 Mon Sep 17 00:00:00 2001
From: Shaun Cutts <shaun@cuttshome.net>
Date: Wed, 28 Jun 2017 02:08:51 -0400
Subject: [PATCH 119/287] pipe() not just fs.WriteStream and express.Response

I believe (in keeping with stream.Transform) that it should be possible to pipe to any Writable... no need to depend on express?
---
 types/archiver/index.d.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/archiver/index.d.ts b/types/archiver/index.d.ts
index 2e4b1063ff..1ceffb18f9 100644
--- a/types/archiver/index.d.ts
+++ b/types/archiver/index.d.ts
@@ -15,9 +15,7 @@
 
 /// <reference types="node" />
 
-import * as fs from 'fs';
 import * as stream from 'stream';
-import * as express from 'express';
 import * as glob from 'glob';
 
 declare function archiver(format: archiver.Format, options?: archiver.ArchiverOptions): archiver.Archiver;
@@ -46,7 +44,7 @@ declare namespace archiver {
         glob(pattern: string, options?: glob.IOptions, data?: EntryData): this;
         finalize(): this;
 
-        pipe(stream: fs.WriteStream | express.Response): void;
+        pipe(stream: stream.Writable): void;
 
         setFormat(format: string): this;
         setModule(module: Function): this;

From 0cefffd28183fd59025d17c9540bff39cff949b0 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Wed, 28 Jun 2017 09:28:40 +0200
Subject: [PATCH 120/287] Update index.d.ts

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

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index fe7fcd28a8..96ed2b0268 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -1,6 +1,5 @@
 // Type definitions for React-Tags (react-tag-input) 4.7.2
 // Project: https://github.com/prakhar1989/react-tags
-// NPM: https://www.npmjs.com/package/react-tag-input
 // Definitions by: Ogglas <https://stackoverflow.com/users/3850405/ogglas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3

From f8156fb34adb09aa89acb1fe67644928d745f756 Mon Sep 17 00:00:00 2001
From: Brian Lee <brianjleeofcl@gmail.com>
Date: Wed, 28 Jun 2017 00:48:12 -0700
Subject: [PATCH 121/287] Add util.inspect.defaultOptions property

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 7bc703db58..b87382f103 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -3953,7 +3953,8 @@ declare module "util" {
         styles: {
             [style: string]: string
         }
-        custom: symbol
+        defaultOptions: InspectOptions;
+        custom: symbol;
     }
     export function isArray(object: any): object is any[];
     export function isRegExp(object: any): object is RegExp;

From aa0986dec09d780193846e9e411fca31e109e2da Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Wed, 28 Jun 2017 09:51:50 +0200
Subject: [PATCH 122/287] Changed to MAJOR.MINOR version and added test code

---
 types/react-tag-input/index.d.ts              |  2 +-
 .../react-tag-input/react-tag-input-tests.ts  | 64 +++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index 96ed2b0268..922e5083b4 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React-Tags (react-tag-input) 4.7.2
+// Type definitions for React-Tags (react-tag-input) 4.7
 // Project: https://github.com/prakhar1989/react-tags
 // Definitions by: Ogglas <https://stackoverflow.com/users/3850405/ogglas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/react-tag-input/react-tag-input-tests.ts b/types/react-tag-input/react-tag-input-tests.ts
index e69de29bb2..bdcdbc37ed 100644
--- a/types/react-tag-input/react-tag-input-tests.ts
+++ b/types/react-tag-input/react-tag-input-tests.ts
@@ -0,0 +1,64 @@
+import * as React from "react";
+import { WithContext as ReactTags, TagItem } from "react-tag-input";
+
+export interface IState {
+    tags: TagItem[];
+    suggestions: string[];
+}
+
+export class Tags extends React.Component<any, IState> {
+    constructor(props: any) {
+        super(props);
+        let tags: TagItem[] = [];
+        let tag: TagItem = {
+            id: 0,
+            text: "Test"
+        };
+        tags.push(tag);
+
+        let suggestions = ["test", "testar"];
+        this.state = {        
+            tags: tags,
+            suggestions: suggestions
+        }
+    }
+    //Not complete
+    handleDelete(i: number) {
+        let tags = this.state.tags;
+        tags.splice(i, 1);
+        this.setState({ tags: tags });
+    }
+
+    handleAddition(tag: string) {
+        let tags = this.state.tags;
+        let tagItem: TagItem = {
+            id: tags.length,
+            text: tag
+        };
+        tags.push(tagItem);
+        this.setState({ tags: tags });
+    }
+    //Not complete
+    handleDrag(tag: TagItem, currPos: number, newPos: number) {
+        let tags = this.state.tags;
+
+        // mutate array
+        tags.splice(currPos, 1);
+        tags.splice(newPos, 0, tag);
+
+        // re-render
+        this.setState({ tags: tags });
+    }
+
+    render() {
+        return (
+                <div>
+                    <ReactTags tags={this.state.tags}
+                    suggestions={this.state.suggestions}
+                        handleDelete={(i: number) => this.handleDelete(i)}
+                        handleAddition={(tag: string) => this.handleAddition(tag)}
+                        handleDrag={(tag: TagItem, currPos: number, newPos: number) => this.handleDrag(tag, currPos, newPos)} />
+                </div>
+        );
+    }
+}

From 682fb04a8420f615ffe68a3f7bf8454428b2bcd8 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Wed, 28 Jun 2017 10:07:42 +0200
Subject: [PATCH 123/287] Change test

---
 .../react-tag-input/react-tag-input-tests.ts  | 72 ++++---------------
 1 file changed, 13 insertions(+), 59 deletions(-)

diff --git a/types/react-tag-input/react-tag-input-tests.ts b/types/react-tag-input/react-tag-input-tests.ts
index bdcdbc37ed..8f126d3609 100644
--- a/types/react-tag-input/react-tag-input-tests.ts
+++ b/types/react-tag-input/react-tag-input-tests.ts
@@ -1,64 +1,18 @@
 import * as React from "react";
 import { WithContext as ReactTags, TagItem } from "react-tag-input";
 
-export interface IState {
-    tags: TagItem[];
-    suggestions: string[];
-}
+let tags = [
+    { id: 0, text: "test" }, { id: 1, text: "testing" }
+];
 
-export class Tags extends React.Component<any, IState> {
-    constructor(props: any) {
-        super(props);
-        let tags: TagItem[] = [];
-        let tag: TagItem = {
-            id: 0,
-            text: "Test"
-        };
-        tags.push(tag);
+let suggestions = ["test", "testar"];
 
-        let suggestions = ["test", "testar"];
-        this.state = {        
-            tags: tags,
-            suggestions: suggestions
-        }
-    }
-    //Not complete
-    handleDelete(i: number) {
-        let tags = this.state.tags;
-        tags.splice(i, 1);
-        this.setState({ tags: tags });
-    }
-
-    handleAddition(tag: string) {
-        let tags = this.state.tags;
-        let tagItem: TagItem = {
-            id: tags.length,
-            text: tag
-        };
-        tags.push(tagItem);
-        this.setState({ tags: tags });
-    }
-    //Not complete
-    handleDrag(tag: TagItem, currPos: number, newPos: number) {
-        let tags = this.state.tags;
-
-        // mutate array
-        tags.splice(currPos, 1);
-        tags.splice(newPos, 0, tag);
-
-        // re-render
-        this.setState({ tags: tags });
-    }
-
-    render() {
-        return (
-                <div>
-                    <ReactTags tags={this.state.tags}
-                    suggestions={this.state.suggestions}
-                        handleDelete={(i: number) => this.handleDelete(i)}
-                        handleAddition={(tag: string) => this.handleAddition(tag)}
-                        handleDrag={(tag: TagItem, currPos: number, newPos: number) => this.handleDrag(tag, currPos, newPos)} />
-                </div>
-        );
-    }
-}
+ReactDOM.render(	
+	<ReactTags tags={tags}
+        suggestions={suggestions}
+        handleDelete={(i: number) => console.log("Delete: " + i)}
+        handleAddition={(tag: string) => console.log("Add: " + tag)}
+        handleDrag={(tag: TagItem, currPos: number, newPos: number) => console.log("Drag: " + tag.text)} />
+	document.getElementById("tag-input")
+	
+);
\ No newline at end of file

From 867079b87c5da7108c945ad0e13da79e0e8673ae Mon Sep 17 00:00:00 2001
From: scarabedore <sebastien.puech@etu.esisar.grenoble-inp.fr>
Date: Wed, 28 Jun 2017 10:09:57 +0200
Subject: [PATCH 124/287] Fixed fs-extra-promise with node typings

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

diff --git a/types/fs-extra-promise/fs-extra-promise-tests.ts b/types/fs-extra-promise/fs-extra-promise-tests.ts
index 9f5a8b32bf..c50115871b 100644
--- a/types/fs-extra-promise/fs-extra-promise-tests.ts
+++ b/types/fs-extra-promise/fs-extra-promise-tests.ts
@@ -205,7 +205,7 @@ readStream = fs.createReadStream(path, {
 writeStream = fs.createWriteStream(path);
 writeStream = fs.createWriteStream(path, {
 	flags: str,
-	encoding: str
+	defaultEncoding: str
 });
 
 let isDirectoryCallback = (err: Error, isDirectory: boolean) => {

From 61b9495f652edf369398087d0c498e966039394d Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Wed, 28 Jun 2017 10:21:22 +0200
Subject: [PATCH 125/287] Update

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

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index 922e5083b4..1ba112945e 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -7,19 +7,14 @@
 import * as React from "react";
 
 export interface ReactTagsProps {
-    tags?: TagItem[];
+    tags?: { id: number; text: string;}[];
     suggestions?: string[];
     handleDelete: ((i: number) => void);
     handleAddition: ((tag: string) => void);
-    handleDrag?: ((tag: TagItem, currPos: number, newPos: number) => void);
+    handleDrag?: ((tag: { id: number; text: string; }, currPos: number, newPos: number) => void);
     placeholder?: string;
 }
 
-export interface TagItem {
-    id: number;
-    text: string;
-}
-
 export class WithContext extends React.Component<ReactTagsProps, {}> { }
 
 export default WithContext;
diff --git a/types/react-tag-input/react-tag-input-tests.ts b/types/react-tag-input/react-tag-input-tests.ts
index 8f126d3609..dce8ae5cef 100644
--- a/types/react-tag-input/react-tag-input-tests.ts
+++ b/types/react-tag-input/react-tag-input-tests.ts
@@ -1,5 +1,6 @@
 import * as React from "react";
-import { WithContext as ReactTags, TagItem } from "react-tag-input";
+import * as ReactDOM from "react-dom";
+import { WithContext as ReactTags } from "react-tag-input";
 
 let tags = [
     { id: 0, text: "test" }, { id: 1, text: "testing" }
@@ -12,7 +13,7 @@ ReactDOM.render(
         suggestions={suggestions}
         handleDelete={(i: number) => console.log("Delete: " + i)}
         handleAddition={(tag: string) => console.log("Add: " + tag)}
-        handleDrag={(tag: TagItem, currPos: number, newPos: number) => console.log("Drag: " + tag.text)} />
+        handleDrag={(tag: { id: number; text: string; }, currPos: number, newPos: number) => console.log("Drag: " + tag.text)} />
 	document.getElementById("tag-input")
 	
 );
\ No newline at end of file

From 0d8b5f768810369e28749af97b072eeb80e00f38 Mon Sep 17 00:00:00 2001
From: Flarna <deb2001-github@yahoo.de>
Date: Wed, 28 Jun 2017 10:30:47 +0200
Subject: [PATCH 126/287] [node] Add async_hooks module

see https://nodejs.org/dist/latest-v8.x/docs/api/async_hooks.html
---
 types/node/index.d.ts    | 61 ++++++++++++++++++++++++++++++++++++++++
 types/node/node-tests.ts | 17 +++++++++++
 2 files changed, 78 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 7691c2c9af..de24fb5f8e 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -8,6 +8,7 @@
 //                 Wilco Bakker <https://github.com/WilcoBakker>
 //                 Nicolas Voigt <https://github.com/octo-sniffle>
 //                 Chigozirim C. <https://github.com/smac89>
+//                 Flarna <https://github.com/Flarna>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -4496,3 +4497,63 @@ declare module "_debugger" {
         new (): ClientInstance
     }
 }
+
+
+// Async Hooks module: https://nodejs.org/api/async_hooks.html
+declare module "async_hooks" {
+    /**
+     * Returns the asyncId of the current execution context.
+     */
+    export function currentId(): number;
+
+    /**
+     * Returns the ID of the resource responsible for calling the callback that is currently being executed.
+     */
+    export function triggerId(): number;
+
+    export interface HookCallbacks {
+        /**
+         * Called when a class is constructed that has the possibility to emit an asynchronous event. 
+         * @param asyncId a unique ID for the async resource
+         * @param type the type of the async resource
+         * @param triggerId the unique ID of the async resource in whose execution context this async resource was created
+         * @param resource reference to the resource representing the async operation, needs to be released during destroy
+         */
+        init?(asyncId: number, type: string, triggerId: number, resource: object): void;
+        /**
+         * When an asynchronous operation is initiated or completes a callback is called to notify the user.
+         * The before callback is called just before said callback is executed.
+         * @param asyncId the unique identifier assigned to the resource about to execute the callback.
+         */
+        before?(asyncId: number): void;
+        /**
+         * Called immediately after the callback specified in before is completed.
+         * @param asyncId the unique identifier assigned to the resource which has executed the callback.
+         */
+        after?(asyncId: number): void;
+        /**
+         * Called after the resource corresponding to asyncId is destroyed
+         * @param asyncId a unique ID for the async resource
+         */
+        destroy?(asyncId: number): void;
+	}
+
+    export interface AsyncHook {
+        /**
+         * Enable the callbacks for a given AsyncHook instance. If no callbacks are provided enabling is a noop.
+         */
+        enable(): this;
+
+        /**
+         * Disable the callbacks for a given AsyncHook instance from the global pool of AsyncHook callbacks to be executed. Once a hook has been disabled it will not be called again until enabled.
+         */
+        disable(): this;
+    }
+
+    /**
+     * Registers functions to be called for different lifetime events of each async operation.
+     * @param options the callbacks to register
+     * @return an AsyncHooks instance used for disabling and enabling hooks
+     */
+    export function createHook(options: HookCallbacks): AsyncHook;
+}
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index aeefc2bbdc..f00f0f4239 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -26,6 +26,7 @@ import * as timers from "timers";
 import * as repl from "repl";
 import * as v8 from "v8";
 import * as dns from "dns";
+import * as async_hooks from "async_hooks";
 
 // Specifically test buffer module regression.
 import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
@@ -2483,3 +2484,19 @@ client.connect(8888, 'localhost');
 client.listbreakpoints((err, body, packet) => {
 
 });
+
+////////////////////////////////////////////////////
+/// AsyncHooks tests : https://nodejs.org/api/async_hooks.html
+////////////////////////////////////////////////////
+namespace async_hooks_tests {
+    const hooks: async_hooks.HookCallbacks = {
+        init: (asyncId: number, type: string, triggerId: number, resource: object) => void {},
+        before: (asyncId: number) => void {},
+        after: (asyncId: number) => void {},
+        destroy: (asyncId: number) => void {}
+    };
+
+    const asyncHook = async_hooks.createHook(hooks);
+
+    asyncHook.enable().disable().enable();
+}

From 48035d0bf4c7d3f500f6d5292b530b432d7d1280 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Wed, 28 Jun 2017 10:35:25 +0200
Subject: [PATCH 127/287] Update test

---
 types/react-tag-input/react-tag-input-tests.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/types/react-tag-input/react-tag-input-tests.ts b/types/react-tag-input/react-tag-input-tests.ts
index dce8ae5cef..d3e8e6fb1e 100644
--- a/types/react-tag-input/react-tag-input-tests.ts
+++ b/types/react-tag-input/react-tag-input-tests.ts
@@ -8,12 +8,11 @@ let tags = [
 
 let suggestions = ["test", "testar"];
 
-ReactDOM.render(	
-	<ReactTags tags={tags}
+ReactDOM.render(
+    <ReactTags tags={tags}
         suggestions={suggestions}
         handleDelete={(i: number) => console.log("Delete: " + i)}
         handleAddition={(tag: string) => console.log("Add: " + tag)}
-        handleDrag={(tag: { id: number; text: string; }, currPos: number, newPos: number) => console.log("Drag: " + tag.text)} />
-	document.getElementById("tag-input")
-	
-);
\ No newline at end of file
+        handleDrag={(tag: { id: number; text: string; }, currPos: number, newPos: number) => console.log("Drag: " + tag.text)} />,
+    document.getElementById("app")
+);

From cd8e349fe7aa27a8445ab7c03d993dff0efdae95 Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Wed, 28 Jun 2017 11:18:37 +0200
Subject: [PATCH 128/287] feat(globby): add typings for `globby`

---
 types/globby/globby-tests.ts | 27 +++++++++++++++++++++++++++
 types/globby/index.d.ts      | 17 +++++++++++++++++
 types/globby/tsconfig.json   | 22 ++++++++++++++++++++++
 types/globby/tslint.json     |  1 +
 4 files changed, 67 insertions(+)
 create mode 100644 types/globby/globby-tests.ts
 create mode 100644 types/globby/index.d.ts
 create mode 100644 types/globby/tsconfig.json
 create mode 100644 types/globby/tslint.json

diff --git a/types/globby/globby-tests.ts b/types/globby/globby-tests.ts
new file mode 100644
index 0000000000..0e08024c63
--- /dev/null
+++ b/types/globby/globby-tests.ts
@@ -0,0 +1,27 @@
+//
+
+import { IOptions } from 'glob';
+
+import * as globby from "globby";
+
+(async () => {
+    let result: string[];
+    result = await globby('*.tmp')
+    result = await globby(['a.tmp', '*.tmp', '!{c,d,e}.tmp'])
+
+    result = globby.sync('*.tmp')
+    result = globby.sync(['a.tmp', '*.tmp', '!{c,d,e}.tmp'])
+
+    result = await globby('*.tmp', Object.freeze({ignore: Object.freeze([])}))
+    result = globby.sync('*.tmp', Object.freeze({ignore: Object.freeze([])}))
+})()
+
+
+const tasks: Array<{
+    pattern: string,
+    options: IOptions
+}> = globby.generateGlobTasks(['*.tmp', '!b.tmp'], {ignore: ['c.tmp']});
+
+console.log(globby.hasMagic('**') === true);
+console.log(globby.hasMagic(['**', 'path1', 'path2']) === true);
+console.log(globby.hasMagic(['path1', 'path2']) === false);
diff --git a/types/globby/index.d.ts b/types/globby/index.d.ts
new file mode 100644
index 0000000000..a469cc3a0b
--- /dev/null
+++ b/types/globby/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for globby 0.6
+// Project: https://github.com/sindresorhus/globby#readme
+// Definitions by: Douglas Duteil <https://github.com/douglasduteil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { IOptions } from 'glob';
+
+declare function globby(patterns: string | string[], options?: Partial<IOptions>): Promise<string[]>;
+
+declare namespace globby {
+  function sync(patterns: string | string[], options?: Partial<IOptions>): string[];
+  function generateGlobTasks(patterns: string | string[], options?: Partial<IOptions>): Array<{pattern: string, options: IOptions}>;
+  function hasMagic(patterns: string | string[], options?: Partial<IOptions>): boolean;
+}
+
+export = globby;
diff --git a/types/globby/tsconfig.json b/types/globby/tsconfig.json
new file mode 100644
index 0000000000..fd75c832f1
--- /dev/null
+++ b/types/globby/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",
+        "globby-tests.ts"
+    ]
+}
diff --git a/types/globby/tslint.json b/types/globby/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/globby/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4afe9ac8321711d8258dd78520e91425e1af7054 Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Wed, 28 Jun 2017 11:28:16 +0200
Subject: [PATCH 129/287] chore(globby): test on all TypeScript versions

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

diff --git a/types/globby/index.d.ts b/types/globby/index.d.ts
index a469cc3a0b..8452dc36ff 100644
--- a/types/globby/index.d.ts
+++ b/types/globby/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/sindresorhus/globby#readme
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
 
 import { IOptions } from 'glob';
 

From 9d37d490249c857a9a4ad191f5f5a0179dc7d7b1 Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Wed, 28 Jun 2017 11:28:46 +0200
Subject: [PATCH 130/287] fix(globby): lint error

---
 types/globby/globby-tests.ts | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/types/globby/globby-tests.ts b/types/globby/globby-tests.ts
index 0e08024c63..0722b5fb37 100644
--- a/types/globby/globby-tests.ts
+++ b/types/globby/globby-tests.ts
@@ -1,21 +1,18 @@
-//
-
 import { IOptions } from 'glob';
 
 import * as globby from "globby";
 
 (async () => {
     let result: string[];
-    result = await globby('*.tmp')
-    result = await globby(['a.tmp', '*.tmp', '!{c,d,e}.tmp'])
+    result = await globby('*.tmp');
+    result = await globby(['a.tmp', '*.tmp', '!{c,d,e}.tmp']);
 
-    result = globby.sync('*.tmp')
-    result = globby.sync(['a.tmp', '*.tmp', '!{c,d,e}.tmp'])
-
-    result = await globby('*.tmp', Object.freeze({ignore: Object.freeze([])}))
-    result = globby.sync('*.tmp', Object.freeze({ignore: Object.freeze([])}))
-})()
+    result = globby.sync('*.tmp');
+    result = globby.sync(['a.tmp', '*.tmp', '!{c,d,e}.tmp']);
 
+    result = await globby('*.tmp', Object.freeze({ignore: Object.freeze([])}));
+    result = globby.sync('*.tmp', Object.freeze({ignore: Object.freeze([])}));
+})();
 
 const tasks: Array<{
     pattern: string,

From 23bb7eed66e50b535c4ce78e1247c59bbb0781fe Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Wed, 28 Jun 2017 11:35:01 +0200
Subject: [PATCH 131/287] fix(globby): remove unnecessary "Partial"

---
 types/globby/index.d.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/types/globby/index.d.ts b/types/globby/index.d.ts
index 8452dc36ff..4752b3d6ad 100644
--- a/types/globby/index.d.ts
+++ b/types/globby/index.d.ts
@@ -2,15 +2,17 @@
 // Project: https://github.com/sindresorhus/globby#readme
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { IOptions } from 'glob';
 
-declare function globby(patterns: string | string[], options?: Partial<IOptions>): Promise<string[]>;
+declare function globby(patterns: string | string[], options?: IOptions): Promise<string[]>;
 
 declare namespace globby {
-  function sync(patterns: string | string[], options?: Partial<IOptions>): string[];
-  function generateGlobTasks(patterns: string | string[], options?: Partial<IOptions>): Array<{pattern: string, options: IOptions}>;
-  function hasMagic(patterns: string | string[], options?: Partial<IOptions>): boolean;
+  function sync(patterns: string | string[], options?: IOptions): string[];
+  function generateGlobTasks(patterns: string | string[], options?: IOptions): Array<{pattern: string, options: IOptions}>;
+  function hasMagic(patterns: string | string[], options?: IOptions): boolean;
 }
 
 export = globby;
+

From 5e53b881264a9c9ea0f0019911bfd3aced29acd2 Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Wed, 28 Jun 2017 11:38:23 +0200
Subject: [PATCH 132/287] style(globby): remove consecutive blank lines

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

diff --git a/types/globby/index.d.ts b/types/globby/index.d.ts
index 4752b3d6ad..d06091551c 100644
--- a/types/globby/index.d.ts
+++ b/types/globby/index.d.ts
@@ -15,4 +15,3 @@ declare namespace globby {
 }
 
 export = globby;
-

From 178b1c2fdb8cab6d64709c1843f4613623cd9a59 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Wed, 28 Jun 2017 12:48:47 +0300
Subject: [PATCH 133/287] jsonx tests updated.

---
 types/jsnox/index.d.ts     |  3 +-
 types/jsnox/jsnox-tests.ts | 75 +++++++++++++++++++-------------------
 types/jsnox/tslint.json    |  1 +
 3 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 types/jsnox/tslint.json

diff --git a/types/jsnox/index.d.ts b/types/jsnox/index.d.ts
index ad5fe5ed2e..e8c3e65b51 100644
--- a/types/jsnox/index.d.ts
+++ b/types/jsnox/index.d.ts
@@ -1,8 +1,9 @@
 // Type definitions for JSnoX
 // Project: https://github.com/af/jsnox
 // Definitions by: Steve Baker <https://github.com/stkb/>
+//                 Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="react" />
 
diff --git a/types/jsnox/jsnox-tests.ts b/types/jsnox/jsnox-tests.ts
index 26014b362f..08821ca8c3 100644
--- a/types/jsnox/jsnox-tests.ts
+++ b/types/jsnox/jsnox-tests.ts
@@ -1,57 +1,56 @@
-
-import * as React from 'react';
-import * as jsnox from 'jsnox';
-var $ = jsnox(React);
+import * as React from "react";
+import * as jsnox from "jsnox";
+let $ = jsnox(React);
 
 interface PersonProps {
-    firstName: string
-    lastName: string
-    age: number
+    firstName: string;
+    lastName: string;
+    age: number;
 }
 
-var Person = React.createClass<PersonProps, {}>({
-    render():React.ReactElement<any> { return null; }
+let Person: React.ClassicComponentClass<PersonProps> = React.createClass<PersonProps, {}>({
+    render(): React.ReactElement<any> { return null; }
 });
 
-var PersonTag = React.createFactory(Person);
+let PersonTag = React.createFactory(Person);
 
-var clickHandler: React.MouseEventHandler<{}>;
+let clickHandler: React.MouseEventHandler<{}>;
 
-// Tests with spec string
-function spec_string () {
-    var result: React.ReactHTMLElement<HTMLElement>
+// tests with spec string
+function spec_string(): void {
+    let result: React.DOMElement<React.DOMAttributes<Element>, Element>;
 
     // just spec string
-    result = $('div')
+    result = $("div");
 
-    // No properties, just children
-    result = $('div', 'hello') // one string child
-    result = $('div', $('span', 'world')) // one element child
-    result = $('div', ['hello', $('span', 'world')]) // mixed array of children
+    // no properties, just children
+    result = $("div", "hello"); // one string child
+    result = $("div", $("span", "world")); // one element child
+    result = $("div", ["hello", $("span", "world")]); // mixed array of children
 
-    // With html properties
-    result = $('div', { onClick: clickHandler }) // no children
-    result = $('div', { onClick: clickHandler }, 'hello') // one string child
-    result = $('div', { onClick: clickHandler }, $('span', 'world')) // one element child
-    result = $('div', { onClick: clickHandler }, ['hello', $('span', 'world')]) // mixed array of children
+    // with html properties
+    result = $("div", { onClick: clickHandler }); // no children
+    result = $("div", { onClick: clickHandler }, "hello"); // one string child
+    result = $("div", { onClick: clickHandler }, $("span", "world")); // one element child
+    result = $("div", { onClick: clickHandler }, ["hello", $("span", "world")]); // mixed array of children
 }
 
-// Tests with react component
-function react_component() {
-    var result: React.ReactElement<{}>
+// tests with react component
+function react_component(): void {
+    let result: React.ReactElement<{}>;
 
     // with nothing more
-    result = $(Person)
+    result = $(Person);
 
-    // No properties, just children
-    result = $(Person, 'hello')                         // one string child
-    result = $(Person, $('span', 'world'))              // one element child
-    result = $(Person, ['hello', $('span', 'world')])   // mixed array of children
+    // no properties, just children
+    result = $(Person, "hello");                         // one string child
+    result = $(Person, $("span", "world"));              // one element child
+    result = $(Person, ["hello", $("span", "world")]);   // mixed array of children
 
-    // With component props
-    var props = { firstName: 'Bob', lastName: 'Garfield', age: 72 }
-    result = $(Person, props)                           // no children
-    result = $(Person, props, 'hello')                  // one string child
-    result = $(Person, props, $('span', 'world'))       // one element child
-    result = $(Person, props, ['hello', PersonTag()])   // mixed array of children
+    // with component props
+    let props: PersonProps = { firstName: "Bob", lastName: "Garfield", age: 72 };
+    result = $(Person, props);                           // no children
+    result = $(Person, props, "hello");                  // one string child
+    result = $(Person, props, $("span", "world"));       // one element child
+    result = $(Person, props, ["hello", PersonTag()]);   // mixed array of children
 }
diff --git a/types/jsnox/tslint.json b/types/jsnox/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsnox/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a4adb4ff04bd15ce4acf2f67d82db07f2ee9404c Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Wed, 28 Jun 2017 13:01:06 +0300
Subject: [PATCH 134/287] dts-lint error fixed in jsnox.

---
 types/jsnox/index.d.ts | 26 ++++++++++----------------
 types/react/index.d.ts |  2 +-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/types/jsnox/index.d.ts b/types/jsnox/index.d.ts
index e8c3e65b51..791141da16 100644
--- a/types/jsnox/index.d.ts
+++ b/types/jsnox/index.d.ts
@@ -1,11 +1,9 @@
-// Type definitions for JSnoX
+// Type definitions for JSnoX 2.1
 // Project: https://github.com/af/jsnox
 // Definitions by: Steve Baker <https://github.com/stkb/>
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-
-/// <reference types="react" />
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -14,13 +12,10 @@ import * as React from "react";
  * This will normally be the React object but could be something else
  */
 interface ReactLikeObject {
-    createElement<P>(type: React.ComponentClass<P> | string,
-        props: P, children: React.ReactNode): React.ReactElement<P>;
+    createElement<P>(type: React.ComponentClass<P> | string, props: P, children: React.ReactNode): React.ReactElement<P>;
 }
 
-interface Module {
-    (reactObj: ReactLikeObject): CreateElement
-}
+type Module = (reactObj: ReactLikeObject) => CreateElement;
 
 interface CreateElement {
     /**
@@ -31,7 +26,7 @@ interface CreateElement {
      * @param children A single React node (string or ReactElement) or array of nodes.
      * Note that unlike with React itself, multiple children must be placed into an array.
      */
-    <P>(specString: string, children: React.ReactNode): React.DOMElement<P, Element>
+    <P>(specString: string, children: React.ReactNode): React.DOMElement<P, Element>;
 
     /**
      * Renders an HTML element from the given spec string, with optional props
@@ -42,8 +37,7 @@ interface CreateElement {
      * @param children A single React node (string or ReactElement) or array of nodes.
      * Note that unlike with React itself, multiple children must be placed into an array.
      */
-    <P>(specString: string, props?: React.HTMLAttributes<{}>, children?: React.ReactNode): React.DOMElement<P, Element>
-
+    <P>(specString: string, props?: React.HTMLAttributes<{}>, children?: React.ReactNode): React.DOMElement<P, Element>;
 
     /**
      * Renders a React component, with children but no props
@@ -52,7 +46,7 @@ interface CreateElement {
      * @param children A single React node (string or ReactElement) or array of nodes.
      * Note that unlike with React itself, multiple children must be placed into an array.
      */
-    <P>(component: React.ComponentClass<P>, children: React.ReactNode): React.ReactElement<P>
+    <P>(component: React.ComponentClass<P>, children: React.ReactNode): React.ReactElement<P>;
 
     /**
      * Renders a React component, with optional props and children
@@ -62,8 +56,8 @@ interface CreateElement {
      * @param children A single React node (string or ReactElement) or array of nodes.
      * Note that unlike with React itself, multiple children must be placed into an array.
      */
-    <P>(component: React.ComponentClass<P>, props?: P, children?: React.ReactNode): React.ReactElement<P>
+    <P>(component: React.ComponentClass<P>, props?: P, children?: React.ReactNode): React.ReactElement<P>;
 }
 
-declare var exports: Module
-export = exports
+declare var exports: Module;
+export = exports;
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 46b34637bc..29190c3c9d 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -12,7 +12,7 @@
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.3
 
 type NativeAnimationEvent = AnimationEvent;
 type NativeClipboardEvent = ClipboardEvent;

From c7fcc1172979b5152f26499c197884ae74edd145 Mon Sep 17 00:00:00 2001
From: Jacob Rask <jacob@jacobrask.net>
Date: Wed, 28 Jun 2017 13:32:59 +0200
Subject: [PATCH 135/287] Remove references to removed section in React README

setState issues were removed.
---
 types/react/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react/README.md b/types/react/README.md
index e38ba90175..594b16d48f 100644
--- a/types/react/README.md
+++ b/types/react/README.md
@@ -1,7 +1,7 @@
 ## Known Problems & Workarounds
 
 ### **The type of `cloneElement` is incorrect.**
-This is similar to the `setState` problem, in that `cloneElement(element, props)` should should accept a `props` object with a subset of the properties on `element.props`. There is an additional complication, however—React attributes, such as `key` and `ref`, should also be accepted in `props`, but should not exist on `element.props`. The "correct" way to model this, then, is with
+`cloneElement(element, props)` should should accept a `props` object with a subset of the properties on `element.props`. React attributes such as `key` and `ref` should also be accepted in `props`, but should not exist on `element.props`. The "correct" way to model this, then, is with
 ```ts
 declare function cloneElement<P extends Q, Q>(
     element: ReactElement<P>,

From 9e62632e245abce6ae0301bec49d0ceede24dea9 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Wed, 28 Jun 2017 15:03:32 +0300
Subject: [PATCH 136/287] Added tslint.json for react.

---
 types/react/index.d.ts    | 482 ++++++++++++++++++++++++++------------
 types/react/test/index.ts | 208 ++++++++--------
 types/react/tslint.json   |   1 +
 3 files changed, 436 insertions(+), 255 deletions(-)
 create mode 100644 types/react/tslint.json

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 29190c3c9d..8800440547 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React v15.0
+// Type definitions for React 15.0
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>
 //                 AssureSign <http://www.assuresign.com>
@@ -30,7 +30,6 @@ export = React;
 export as namespace React;
 
 declare namespace React {
-
     //
     // React Elements
     // ----------------------------------------------------------------------
@@ -40,6 +39,8 @@ declare namespace React {
 
     type Key = string | number;
     type Ref<T> = string | ((instance: T | null) => any);
+
+    // tslint:disable:interface-over-type-literal
     type ComponentState = {};
 
     interface Attributes {
@@ -84,32 +85,29 @@ declare namespace React {
     // Factories
     // ----------------------------------------------------------------------
 
-    interface Factory<P> {
-        (props?: Attributes & P, ...children: ReactNode[]): ReactElement<P>;
-    }
+    type Factory<P> = (props?: Attributes & P, ...children: ReactNode[]) => ReactElement<P>;
 
-    interface SFCFactory<P> {
-        (props?: Attributes & P, ...children: ReactNode[]): SFCElement<P>;
-    }
+    type SFCFactory<P> = (props?: Attributes & P, ...children: ReactNode[]) => SFCElement<P>;
 
-    interface ComponentFactory<P, T extends Component<P, ComponentState>> {
-        (props?: ClassAttributes<T> & P, ...children: ReactNode[]): CElement<P, T>;
-    }
+    type ComponentFactory<P, T extends Component<P, ComponentState>> =
+        (props?: ClassAttributes<T> & P, ...children: ReactNode[]) => CElement<P, T>;
 
     type CFactory<P, T extends Component<P, ComponentState>> = ComponentFactory<P, T>;
     type ClassicFactory<P> = CFactory<P, ClassicComponent<P, ComponentState>>;
 
-    interface DOMFactory<P extends DOMAttributes<T>, T extends Element> {
-        (props?: ClassAttributes<T> & P | null, ...children: ReactNode[]): DOMElement<P, T>;
-    }
+    type DOMFactory<P extends DOMAttributes<T>, T extends Element> =
+        (props?: ClassAttributes<T> & P | null, ...children: ReactNode[]) => DOMElement<P, T>;
 
     interface HTMLFactory<T extends HTMLElement> extends DOMFactory<HTMLAttributes<T>, T> {
+        (props?: ClassAttributes<T> & HTMLAttributes<T> | null, ...children: ReactNode[]): ReactHTMLElement<T>;
     }
 
     interface ChangeTargetHTMLFactory<T extends HTMLElement> extends DOMFactory<ChangeTargetHTMLAttributes<T>, T> {
+        (props?: ClassAttributes<T> & ChangeTargetHTMLAttributes<T> | null, ...children: ReactNode[]): ReactHTMLElement<T>;
     }
 
     interface SVGFactory extends DOMFactory<SVGAttributes<SVGElement>, SVGElement> {
+        (props?: ClassAttributes<SVGElement> & SVGAttributes<SVGElement> | null, ...children: ReactNode[]): ReactSVGElement;
     }
 
     //
@@ -168,6 +166,10 @@ declare namespace React {
         element: DOMElement<P, T>,
         props?: ClassAttributes<T> & P,
         ...children: ReactNode[]): DOMElement<P, T>;
+    function cloneElement<P extends HTMLAttributes<T>, T extends HTMLElement>(
+        element: ReactHTMLElement<T>,
+        props?: ClassAttributes<T> & P,
+        ...children: ReactNode[]): ReactHTMLElement<T>;
     function cloneElement<P extends Q, Q>(
         element: SFCElement<P>,
         props?: Q, // should be Q & Attributes, but then Q is inferred as {}
@@ -183,10 +185,10 @@ declare namespace React {
 
     function isValidElement<P>(object: {}): object is ReactElement<P>;
 
-    var DOM: ReactDOM;
-    var PropTypes: ReactPropTypes;
-    var Children: ReactChildren;
-    var version: string;
+    const DOM: ReactDOM;
+    const PropTypes: ReactPropTypes;
+    const Children: ReactChildren;
+    const version: string;
 
     //
     // Component API
@@ -195,9 +197,12 @@ declare namespace React {
     type ReactInstance = Component<any> | Element;
 
     // Base component for plain JS classes
+    // tslint:disable:no-empty-interface
     interface Component<P = {}, S = {}> extends ComponentLifecycle<P, S> { }
     class Component<P, S> {
         constructor(props?: P, context?: any);
+        // Disabling unified-signatures to have separate overloads. It's easier to understand this way.
+        // tslint:disable:unified-signatures
         setState<K extends keyof S>(f: (prevState: S, props: P) => Pick<S, K>, callback?: () => any): void;
         setState<K extends keyof S>(state: Pick<S, K>, callback?: () => any): void;
         forceUpdate(callBack?: () => any): void;
@@ -280,7 +285,7 @@ declare namespace React {
     }
 
     interface Mixin<P, S> extends ComponentLifecycle<P, S> {
-        mixins?: Mixin<P, S>[];
+        mixins?: Array<Mixin<P, S>>;
         statics?: {
             [key: string]: any;
         };
@@ -432,9 +437,7 @@ declare namespace React {
     // Event Handler Types
     // ----------------------------------------------------------------------
 
-    interface EventHandler<E extends SyntheticEvent<any>> {
-        (event: E): void;
-    }
+    type EventHandler<E extends SyntheticEvent<any>> = (event: E) => void;
 
     type ReactEventHandler<T> = EventHandler<SyntheticEvent<T>>;
 
@@ -670,7 +673,6 @@ declare namespace React {
     // This interface is not complete. Only properties accepting
     // unitless numbers are listed here (see CSSProperty.js in React)
     interface CSSProperties {
-
         /**
          * Aligns a flex container's lines within the flex container when there is extra space in the cross-axis, similar to how justify-content aligns individual items within the main-axis.
          */
@@ -687,7 +689,10 @@ declare namespace React {
         alignSelf?: CSSWideKeyword | "auto" | "flex-start" | "flex-end" | "center" | "baseline" | "stretch";
 
         /**
-         * This property allows precise alignment of elements, such as graphics, that do not have a baseline-table or lack the desired baseline in their baseline-table. With the alignment-adjust property, the position of the baseline identified by the alignment-baseline can be explicitly determined. It also determines precisely the alignment point for each glyph within a textual element.
+         * This property allows precise alignment of elements, such as graphics,
+         * that do not have a baseline-table or lack the desired baseline in their baseline-table.
+         * With the alignment-adjust property, the position of the baseline identified by the alignment-baseline
+         * can be explicitly determined. It also determines precisely the alignment point for each glyph within a textual element.
          */
         alignmentAdjust?: CSSWideKeyword | any;
 
@@ -746,7 +751,9 @@ declare namespace React {
 
         /**
          * This property describes how the element's background images should blend with each other and the element's background color.
-         * The value is a list of blend modes that corresponds to each background image. Each element in the list will apply to the corresponding element of background-image. If a property doesn’t have enough comma-separated values to match the number of layers, the UA must calculate its used value by repeating the list of values until there are enough.
+         * The value is a list of blend modes that corresponds to each background image. Each element in the list will apply to the
+         * corresponding element of background-image. If a property doesn’t have enough comma-separated values to match the number of layers,
+         * the UA must calculate its used value by repeating the list of values until there are enough.
          */
         backgroundBlendMode?: CSSWideKeyword | any;
 
@@ -788,7 +795,8 @@ declare namespace React {
         behavior?: CSSWideKeyword | any;
 
         /**
-         * Shorthand property that defines the different properties of all four sides of an element's border in a single declaration. It can be used to set border-width, border-style and border-color, or a subset of these.
+         * Shorthand property that defines the different properties of all four sides of an element's border in a single declaration.
+         * It can be used to set border-width, border-style and border-color, or a subset of these.
          */
         border?: CSSWideKeyword | any;
 
@@ -819,7 +827,9 @@ declare namespace React {
         borderBottomStyle?: CSSWideKeyword | any;
 
         /**
-         * Sets the width of an element's bottom border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         * Sets the width of an element's bottom border. To set all four borders,
+         * use the border-width shorthand property which sets the values simultaneously for border-top-width,
+         * border-right-width, border-bottom-width, and border-left-width.
          */
         borderBottomWidth?: CSSWideKeyword | any;
 
@@ -829,69 +839,90 @@ declare namespace React {
         borderCollapse?: CSSWideKeyword | any;
 
         /**
-         * The CSS border-color property sets the color of an element's four borders. This property can have from one to four values, made up of the elementary properties:
+         * The CSS border-color property sets the color of an element's four borders.
+         * This property can have from one to four values, made up of the elementary properties:
          *      •       border-top-color
          *      •       border-right-color
          *      •       border-bottom-color
          *      •       border-left-color The default color is the currentColor of each of these values.
-         * If you provide one value, it sets the color for the element. Two values set the horizontal and vertical values, respectively. Providing three values sets the top, vertical, and bottom values, in that order. Four values set all for sides: top, right, bottom, and left, in that order.
+         * If you provide one value, it sets the color for the element. Two values set the horizontal and vertical values,
+         * respectively. Providing three values sets the top, vertical, and bottom values, in that order.
+         * Four values set all for sides: top, right, bottom, and left, in that order.
          */
         borderColor?: CSSWideKeyword | any;
 
         /**
-         * Specifies different corner clipping effects, such as scoop (inner curves), bevel (straight cuts) or notch (cut-off rectangles). Works along with border-radius to specify the size of each corner effect.
+         * Specifies different corner clipping effects, such as scoop (inner curves), bevel (straight cuts) or notch (cut-off rectangles).
+         * Works along with border-radius to specify the size of each corner effect.
          */
         borderCornerShape?: CSSWideKeyword | any;
 
         /**
-         * The property border-image-source is used to set the image to be used instead of the border style. If this is set to none the border-style is used instead.
+         * The property border-image-source is used to set the image to be used instead of the border style.
+         * If this is set to none the border-style is used instead.
          */
         borderImageSource?: CSSWideKeyword | any;
 
         /**
-         * The border-image-width CSS property defines the offset to use for dividing the border image in nine parts, the top-left corner, central top edge, top-right-corner, central right edge, bottom-right corner, central bottom edge, bottom-left corner, and central right edge. They represent inward distance from the top, right, bottom, and left edges.
+         * The border-image-width CSS property defines the offset to use for dividing the border image in nine parts,
+         * the top-left corner, central top edge, top-right-corner, central right edge, bottom-right corner, central bottom edge,
+         * bottom-left corner, and central right edge. They represent inward distance from the top, right, bottom, and left edges.
          */
         borderImageWidth?: CSSWideKeyword | any;
 
         /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's left border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the left border — border-left-width, border-left-style and border-left-color.
+         * Shorthand property that defines the border-width, border-style and border-color of an element's left border in a single declaration.
+         * Note that you can use the corresponding longhand properties to set specific individual properties of the left border — border-left-width,
+         * border-left-style and border-left-color.
          */
         borderLeft?: CSSWideKeyword | any;
 
         /**
-         * The CSS border-left-color property sets the color of an element's left border. This page explains the border-left-color value, but often you will find it more convenient to fix the border's left color as part of a shorthand set, either border-left or border-color.
+         * The CSS border-left-color property sets the color of an element's left border. This page explains the border-left-color value,
+         * but often you will find it more convenient to fix the border's left color as part of a shorthand set, either border-left or border-color.
          * Colors can be defined several ways. For more information, see Usage.
          */
         borderLeftColor?: CSSWideKeyword | any;
 
         /**
-         * Sets the style of an element's left border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         * Sets the style of an element's left border. To set all four borders, use the shorthand property, border-style.
+         * Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
          */
         borderLeftStyle?: CSSWideKeyword | any;
 
         /**
-         * Sets the width of an element's left border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         * Sets the width of an element's left border. To set all four borders,
+         * use the border-width shorthand property which sets the values simultaneously for border-top-width,
+         * border-right-width, border-bottom-width, and border-left-width.
          */
         borderLeftWidth?: CSSWideKeyword | any;
 
         /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's right border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the right border — border-right-width, border-right-style and border-right-color.
+         * Shorthand property that defines the border-width, border-style and border-color of an element's right border
+         * in a single declaration. Note that you can use the corresponding longhand properties to set specific
+         * individual properties of the right border — border-right-width, border-right-style and border-right-color.
          */
         borderRight?: CSSWideKeyword | any;
 
         /**
-         * Sets the color of an element's right border. This page explains the border-right-color value, but often you will find it more convenient to fix the border's right color as part of a shorthand set, either border-right or border-color.
+         * Sets the color of an element's right border. This page explains the border-right-color value,
+         * but often you will find it more convenient to fix the border's right color as part of a shorthand set,
+         * either border-right or border-color.
          * Colors can be defined several ways. For more information, see Usage.
          */
         borderRightColor?: CSSWideKeyword | any;
 
         /**
-         * Sets the style of an element's right border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         * Sets the style of an element's right border. To set all four borders, use the shorthand property,
+         * border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style,
+         * border-bottom-style, border-left-style.
          */
         borderRightStyle?: CSSWideKeyword | any;
 
         /**
-         * Sets the width of an element's right border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         * Sets the width of an element's right border. To set all four borders,
+         * use the border-width shorthand property which sets the values simultaneously for border-top-width,
+         * border-right-width, border-bottom-width, and border-left-width.
          */
         borderRightWidth?: CSSWideKeyword | any;
 
@@ -901,17 +932,24 @@ declare namespace React {
         borderSpacing?: CSSWideKeyword | any;
 
         /**
-         * Sets the style of an element's four borders. This property can have from one to four values. With only one value, the value will be applied to all four borders; otherwise, this works as a shorthand property for each of border-top-style, border-right-style, border-bottom-style, border-left-style, where each border style may be assigned a separate value.
+         * Sets the style of an element's four borders. This property can have from one to four values.
+         * With only one value, the value will be applied to all four borders;
+         * otherwise, this works as a shorthand property for each of border-top-style, border-right-style,
+         * border-bottom-style, border-left-style, where each border style may be assigned a separate value.
          */
         borderStyle?: CSSWideKeyword | any;
 
         /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's top border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the top border — border-top-width, border-top-style and border-top-color.
+         * Shorthand property that defines the border-width, border-style and border-color of an element's top border
+         * in a single declaration. Note that you can use the corresponding longhand properties to set specific
+         * individual properties of the top border — border-top-width, border-top-style and border-top-color.
          */
         borderTop?: CSSWideKeyword | any;
 
         /**
-         * Sets the color of an element's top border. This page explains the border-top-color value, but often you will find it more convenient to fix the border's top color as part of a shorthand set, either border-top or border-color.
+         * Sets the color of an element's top border. This page explains the border-top-color value,
+         * but often you will find it more convenient to fix the border's top color as part of a shorthand set,
+         * either border-top or border-color.
          * Colors can be defined several ways. For more information, see Usage.
          */
         borderTopColor?: CSSWideKeyword | any;
@@ -927,22 +965,30 @@ declare namespace React {
         borderTopRightRadius?: CSSWideKeyword | any;
 
         /**
-         * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+         * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style.
+         * Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
          */
         borderTopStyle?: CSSWideKeyword | any;
 
         /**
-         * Sets the width of an element's top border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         * Sets the width of an element's top border. To set all four borders,
+         * use the border-width shorthand property which sets the values simultaneously for border-top-width,
+         * border-right-width, border-bottom-width, and border-left-width.
          */
         borderTopWidth?: CSSWideKeyword | any;
 
         /**
-         * Sets the width of an element's four borders. This property can have from one to four values. This is a shorthand property for setting values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+         * Sets the width of an element's four borders. This property can have from one to four values.
+         * This is a shorthand property for setting values simultaneously for border-top-width,
+         * border-right-width, border-bottom-width, and border-left-width.
          */
         borderWidth?: CSSWideKeyword | any;
 
         /**
-         * This property specifies how far an absolutely positioned box's bottom margin edge is offset above the bottom edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the bottom edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
+         * This property specifies how far an absolutely positioned box's bottom margin edge
+         * is offset above the bottom edge of the box's containing block. For relatively positioned boxes,
+         * the offset is with respect to the bottom edges of the box itself
+         * (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
          */
         bottom?: CSSWideKeyword | any;
 
@@ -952,7 +998,9 @@ declare namespace React {
         boxAlign?: CSSWideKeyword | any;
 
         /**
-         * Breaks a box into fragments creating new borders, padding and repeating backgrounds or lets it stay as a continuous box on a page break, column break, or, for inline elements, at a line break.
+         * Breaks a box into fragments creating new borders,
+         * padding and repeating backgrounds or lets it stay as a continuous box on a page break,
+         * column break, or, for inline elements, at a line break.
          */
         boxDecorationBreak?: CSSWideKeyword | any;
 
@@ -975,7 +1023,8 @@ declare namespace React {
 
         /**
          * Do not use. This property has been replaced by flex-order.
-         * Specifies the ordinal group that a child element of the object belongs to. This ordinal value identifies the display order (along the axis defined by the box-orient property) for the group.
+         * Specifies the ordinal group that a child element of the object belongs to.
+         * This ordinal value identifies the display order (along the axis defined by the box-orient property) for the group.
          */
         boxOrdinalGroup?: CSSWideKeyword | any;
 
@@ -996,7 +1045,11 @@ declare namespace React {
         boxShadow?: CSSWideKeyword | any;
 
         /**
-         * The CSS break-after property allows you to force a break on multi-column layouts. More specifically, it allows you to force a break after an element. It allows you to determine if a break should occur, and what type of break it should be. The break-after CSS property describes how the page, column or region break behaves after the generated box. If there is no generated box, the property is ignored.
+         * The CSS break-after property allows you to force a break on multi-column layouts.
+         * More specifically, it allows you to force a break after an element.
+         * It allows you to determine if a break should occur, and what type of break it should be.
+         * The break-after CSS property describes how the page, column or region break behaves after the generated box.
+         * If there is no generated box, the property is ignored.
          */
         breakAfter?: CSSWideKeyword | any;
 
@@ -1011,23 +1064,28 @@ declare namespace React {
         breakInside?: CSSWideKeyword | any;
 
         /**
-         * The clear CSS property specifies if an element can be positioned next to or must be positioned below the floating elements that precede it in the markup.
+         * The clear CSS property specifies if an element can be positioned next to
+         * or must be positioned below the floating elements that precede it in the markup.
          */
         clear?: CSSWideKeyword | any;
 
         /**
          * Deprecated; see clip-path.
-         * Lets you specify the dimensions of an absolutely positioned element that should be visible, and the element is clipped into this shape, and displayed.
+         * Lets you specify the dimensions of an absolutely positioned element that should be visible,
+         * and the element is clipped into this shape, and displayed.
          */
         clip?: CSSWideKeyword | any;
 
         /**
-         * Clipping crops an graphic, so that only a portion of the graphic is rendered, or filled. This clip-rule property, when used with the clip-path property, defines which clip rule, or algorithm, to use when filling the different parts of a graphics.
+         * Clipping crops an graphic, so that only a portion of the graphic is rendered, or filled.
+         * This clip-rule property, when used with the clip-path property, defines which clip rule, or algorithm,
+         * to use when filling the different parts of a graphics.
          */
         clipRule?: CSSWideKeyword | any;
 
         /**
-         * The color property sets the color of an element's foreground content (usually text), accepting any standard CSS color from keywords and hex values to RGB(a) and HSL(a).
+         * The color property sets the color of an element's foreground content (usually text),
+         * accepting any standard CSS color from keywords and hex values to RGB(a) and HSL(a).
          */
         color?: CSSWideKeyword | any;
 
@@ -1063,7 +1121,8 @@ declare namespace React {
         columnRuleWidth?: CSSWideKeyword | any;
 
         /**
-         * The column-span CSS property makes it possible for an element to span across all columns when its value is set to all. An element that spans more than one column is called a spanning element.
+         * The column-span CSS property makes it possible for an element to span across all columns when its value is set to all.
+         * An element that spans more than one column is called a spanning element.
          */
         columnSpan?: CSSWideKeyword | any;
 
@@ -1078,22 +1137,31 @@ declare namespace React {
         columns?: CSSWideKeyword | any;
 
         /**
-         * The counter-increment property accepts one or more names of counters (identifiers), each one optionally followed by an integer which specifies the value by which the counter should be incremented (e.g. if the value is 2, the counter increases by 2 each time it is invoked).
+         * The counter-increment property accepts one or more names of counters (identifiers),
+         * each one optionally followed by an integer which specifies the value by which the counter should be incremented
+         * (e.g. if the value is 2, the counter increases by 2 each time it is invoked).
          */
         counterIncrement?: CSSWideKeyword | any;
 
         /**
-         * The counter-reset property contains a list of one or more names of counters, each one optionally followed by an integer (otherwise, the integer defaults to 0.) Each time the given element is invoked, the counters specified by the property are set to the given integer.
+         * The counter-reset property contains a list of one or more names of counters,
+         * each one optionally followed by an integer (otherwise, the integer defaults to 0.).
+         * Each time the given element is invoked, the counters specified by the property are set to the given integer.
          */
         counterReset?: CSSWideKeyword | any;
 
         /**
-         * The cue property specifies sound files (known as an "auditory icon") to be played by speech media agents before and after presenting an element's content; if only one file is specified, it is played both before and after. The volume at which the file(s) should be played, relative to the volume of the main element, may also be specified. The icon files may also be set separately with the cue-before and cue-after properties.
+         * The cue property specifies sound files (known as an "auditory icon") to be played by speech media agents
+         * before and after presenting an element's content; if only one file is specified, it is played both before and after.
+         * The volume at which the file(s) should be played, relative to the volume of the main element, may also be specified.
+         * The icon files may also be set separately with the cue-before and cue-after properties.
          */
         cue?: CSSWideKeyword | any;
 
         /**
-         * The cue-after property specifies a sound file (known as an "auditory icon") to be played by speech media agents after presenting an element's content; the volume at which the file should be played may also be specified. The shorthand property cue sets cue sounds for both before and after the element is presented.
+         * The cue-after property specifies a sound file (known as an "auditory icon") to be played by speech media agents
+         * after presenting an element's content; the volume at which the file should be played may also be specified.
+         * The shorthand property cue sets cue sounds for both before and after the element is presented.
          */
         cueAfter?: CSSWideKeyword | any;
 
@@ -1113,7 +1181,11 @@ declare namespace React {
         display?: CSSWideKeyword | any;
 
         /**
-         * The ‘fill’ property paints the interior of the given graphical element. The area to be painted consists of any areas inside the outline of the shape. To determine the inside of the shape, all subpaths are considered, and the interior is determined according to the rules associated with the current value of the ‘fill-rule’ property. The zero-width geometric outline of a shape is included in the area to be painted.
+         * The ‘fill’ property paints the interior of the given graphical element.
+         * The area to be painted consists of any areas inside the outline of the shape.
+         * To determine the inside of the shape, all subpaths are considered,
+         * and the interior is determined according to the rules associated with the current value of the ‘fill-rule’ property.
+         * The zero-width geometric outline of a shape is included in the area to be painted.
          */
         fill?: CSSWideKeyword | any;
 
@@ -1124,7 +1196,10 @@ declare namespace React {
         fillOpacity?: CSSWideKeyword | number;
 
         /**
-         * The ‘fill-rule’ property indicates the algorithm which is to be used to determine what parts of the canvas are included inside the shape. For a simple, non-intersecting path, it is intuitively clear what region lies "inside"; however, for a more complex path, such as a path that intersects itself or where one subpath encloses another, the interpretation of "inside" is not so obvious.
+         * The ‘fill-rule’ property indicates the algorithm which is to be used to determine what parts of the canvas are included inside the shape.
+         * For a simple, non-intersecting path, it is intuitively clear what region lies "inside";
+         * however, for a more complex path, such as a path that intersects itself or where one subpath encloses another,
+         * the interpretation of "inside" is not so obvious.
          * The ‘fill-rule’ property provides two options for how the inside of a shape is determined:
          */
         fillRule?: CSSWideKeyword | any;
@@ -1146,7 +1221,8 @@ declare namespace React {
         flexAlign?: CSSWideKeyword | any;
 
         /**
-         * The flex-basis CSS property describes the initial main size of the flex item before any free space is distributed according to the flex factors described in the flex property (flex-grow and flex-shrink).
+         * The flex-basis CSS property describes the initial main size of the flex item
+         * before any free space is distributed according to the flex factors described in the flex property (flex-grow and flex-shrink).
          */
         flexBasis?: CSSWideKeyword | any;
 
@@ -1190,13 +1266,17 @@ declare namespace React {
         flexShrink?: CSSWideKeyword | number;
 
         /**
-         * Specifies whether flex items are forced into a single line or can be wrapped onto multiple lines. If wrapping is allowed, this property also enables you to control the direction in which lines are stacked.
+         * Specifies whether flex items are forced into a single line or can be wrapped onto multiple lines.
+         * If wrapping is allowed, this property also enables you to control the direction in which lines are stacked.
          * See CSS flex-wrap property https://drafts.csswg.org/css-flexbox-1/#flex-wrap-property
          */
         flexWrap?: CSSWideKeyword | "nowrap" | "wrap" | "wrap-reverse";
 
         /**
-         * Elements which have the style float are floated horizontally. These elements can move as far to the left or right of the containing element. All elements after the floating element will flow around it, but elements before the floating element are not impacted. If several floating elements are placed after each other, they will float next to each other as long as there is room.
+         * Elements which have the style float are floated horizontally.
+         * These elements can move as far to the left or right of the containing element.
+         * All elements after the floating element will flow around it, but elements before the floating element are not impacted.
+         * If several floating elements are placed after each other, they will float next to each other as long as there is room.
          */
         float?: CSSWideKeyword | any;
 
@@ -1206,17 +1286,20 @@ declare namespace React {
         flowFrom?: CSSWideKeyword | any;
 
         /**
-         * The font property is shorthand that allows you to do one of two things: you can either set up six of the most mature font properties in one line, or you can set one of a choice of keywords to adopt a system font setting.
+         * The font property is shorthand that allows you to do one of two things: you can either set up six of the most mature font properties in one line,
+         * or you can set one of a choice of keywords to adopt a system font setting.
          */
         font?: CSSWideKeyword | any;
 
         /**
-         * The font-family property allows one or more font family names and/or generic family names to be specified for usage on the selected element(s)' text. The browser then goes through the list; for each character in the selection it applies the first font family that has an available glyph for that character.
+         * The font-family property allows one or more font family names and/or generic family names to be specified for usage on the selected element(s)' text.
+         * The browser then goes through the list; for each character in the selection it applies the first font family that has an available glyph for that character.
          */
         fontFamily?: CSSWideKeyword | any;
 
         /**
-         * The font-kerning property allows contextual adjustment of inter-glyph spacing, i.e. the spaces between the characters in text. This property controls <bold>metric kerning</bold> - that utilizes adjustment data contained in the font. Optical Kerning is not supported as yet.
+         * The font-kerning property allows contextual adjustment of inter-glyph spacing, i.e. the spaces between the characters in text.
+         * This property controls <bold>metric kerning</bold> - that utilizes adjustment data contained in the font. Optical Kerning is not supported as yet.
          */
         fontKerning?: CSSWideKeyword | any;
 
@@ -1225,12 +1308,14 @@ declare namespace React {
          * See CSS 3 font-size property https://www.w3.org/TR/css-fonts-3/#propdef-font-size
          */
         fontSize?: CSSWideKeyword |
-                   "xx-small" | "x-small" | "small" | "medium" | "large" | "x-large" | "xx-large" |
-                   "larger" | "smaller" |
-                   CSSLength | CSSPercentage;
+        "xx-small" | "x-small" | "small" | "medium" | "large" | "x-large" | "xx-large" |
+        "larger" | "smaller" |
+        CSSLength | CSSPercentage;
 
         /**
-         * The font-size-adjust property adjusts the font-size of the fallback fonts defined with font-family, so that the x-height is the same no matter what font is used. This preserves the readability of the text when fallback happens.
+         * The font-size-adjust property adjusts the font-size of the fallback fonts defined with font-family,
+         * so that the x-height is the same no matter what font is used.
+         * This preserves the readability of the text when fallback happens.
          * See CSS 3 font-size-adjust property https://www.w3.org/TR/css-fonts-3/#propdef-font-size-adjust
          */
         fontSizeAdjust?: CSSWideKeyword | "none" | number;
@@ -1240,11 +1325,13 @@ declare namespace React {
          * See CSS 3 font-stretch property https://drafts.csswg.org/css-fonts-3/#propdef-font-stretch
          */
         fontStretch?: CSSWideKeyword |
-                      "normal" | "ultra-condensed" | "extra-condensed" | "condensed" | "semi-condensed" |
-                      "semi-expanded" | "expanded" | "extra-expanded" | "ultra-expanded";
+        "normal" | "ultra-condensed" | "extra-condensed" | "condensed" | "semi-condensed" |
+        "semi-expanded" | "expanded" | "extra-expanded" | "ultra-expanded";
 
         /**
-         * The font-style property allows normal, italic, or oblique faces to be selected. Italic forms are generally cursive in nature while oblique faces are typically sloped versions of the regular face. Oblique faces can be simulated by artificially sloping the glyphs of the regular face.
+         * The font-style property allows normal, italic, or oblique faces to be selected.
+         * Italic forms are generally cursive in nature while oblique faces are typically sloped versions of the regular face.
+         * Oblique faces can be simulated by artificially sloping the glyphs of the regular face.
          * See CSS 3 font-style property https://www.w3.org/TR/css-fonts-3/#propdef-font-style
          */
         fontStyle?: CSSWideKeyword | "normal" | "italic" | "oblique";
@@ -1281,12 +1368,15 @@ declare namespace React {
         gridColumn?: CSSWideKeyword | any;
 
         /**
-         * Controls a grid item's placement in a grid area as well as grid position and a grid span. The grid-column-end property (with grid-row-start, grid-row-end, and grid-column-start) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
+         * Controls a grid item's placement in a grid area as well as grid position and a grid span.
+         * The grid-column-end property (with grid-row-start, grid-row-end, and grid-column-start) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
          */
         gridColumnEnd?: CSSWideKeyword | any;
 
         /**
-         * Determines a grid item's placement by specifying the starting grid lines of a grid item's grid area . A grid item's placement in a grid area consists of a grid position and a grid span. See also ( grid-row-start, grid-row-end, and grid-column-end)
+         * Determines a grid item's placement by specifying the starting grid lines of a grid item's grid area.
+         * A grid item's placement in a grid area consists of a grid position and a grid span.
+         * See also ( grid-row-start, grid-row-end, and grid-column-end)
          */
         gridColumnStart?: CSSWideKeyword | any;
 
@@ -1296,7 +1386,8 @@ declare namespace React {
         gridRow?: CSSWideKeyword | any;
 
         /**
-         * Determines a grid item’s placement by specifying the block-end. A grid item's placement in a grid area consists of a grid position and a grid span. The grid-row-end property (with grid-row-start, grid-column-start, and grid-column-end) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
+         * Determines a grid item’s placement by specifying the block-end. A grid item's placement in a grid area consists of a grid position and a grid span.
+         * The grid-row-end property (with grid-row-start, grid-column-start, and grid-column-end) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
          */
         gridRowEnd?: CSSWideKeyword | any;
 
@@ -1309,17 +1400,22 @@ declare namespace React {
         gridRowSpan?: CSSWideKeyword | any;
 
         /**
-         * Specifies named grid areas which are not associated with any particular grid item, but can be referenced from the grid-placement properties. The syntax of the grid-template-areas property also provides a visualization of the structure of the grid, making the overall layout of the grid container easier to understand.
+         * Specifies named grid areas which are not associated with any particular grid item, but can be referenced from the grid-placement properties.
+         * The syntax of the grid-template-areas property also provides a visualization of the structure of the grid, making the overall layout of the grid container easier to understand.
          */
         gridTemplateAreas?: CSSWideKeyword | any;
 
         /**
-         * Specifies (with grid-template-rows) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
+         * Specifies (with grid-template-rows) the line names and track sizing functions of the grid.
+         * Each sizing function can be specified as a length, a percentage of the grid container’s size,
+         * a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
          */
         gridTemplateColumns?: CSSWideKeyword | any;
 
         /**
-         * Specifies (with grid-template-columns) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
+         * Specifies (with grid-template-columns) the line names and track sizing functions of the grid.
+         * Each sizing function can be specified as a length, a percentage of the grid container’s size,
+         * a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
          */
         gridTemplateRows?: CSSWideKeyword | any;
 
@@ -1339,7 +1435,8 @@ declare namespace React {
         hyphenateLimitLines?: CSSWideKeyword | any;
 
         /**
-         * Specifies the maximum amount of trailing whitespace (before justification) that may be left in a line before hyphenation is triggered to pull part of a word from the next line back up into the current one.
+         * Specifies the maximum amount of trailing whitespace (before justification) that may be left in a line before hyphenation is triggered
+         * to pull part of a word from the next line back up into the current one.
          */
         hyphenateLimitZone?: CSSWideKeyword | any;
 
@@ -1396,7 +1493,9 @@ declare namespace React {
         listStyle?: CSSWideKeyword | any;
 
         /**
-         * This property sets the image that will be used as the list item marker. When the image is available, it will replace the marker set with the 'list-style-type' marker. That also means that if the image is not available, it will show the style specified by list-style-property
+         * This property sets the image that will be used as the list item marker. When the image is available,
+         * it will replace the marker set with the 'list-style-type' marker. That also means that if the image is not available,
+         * it will show the style specified by list-style-property
          */
         listStyleImage?: CSSWideKeyword | any;
 
@@ -1411,7 +1510,9 @@ declare namespace React {
         listStyleType?: CSSWideKeyword | any;
 
         /**
-         * The margin property is shorthand to allow you to set all four margins of an element at once. Its equivalent longhand properties are margin-top, margin-right, margin-bottom and margin-left. Negative values are also allowed.
+         * The margin property is shorthand to allow you to set all four margins of an element at once.
+         * Its equivalent longhand properties are margin-top, margin-right, margin-bottom and margin-left.
+         * Negative values are also allowed.
          */
         margin?: CSSWideKeyword | any;
 
@@ -1446,22 +1547,29 @@ declare namespace React {
         marqueeStyle?: CSSWideKeyword | any;
 
         /**
-         * This property is shorthand for setting mask-image, mask-mode, mask-repeat, mask-position, mask-clip, mask-origin, mask-composite and mask-size. Omitted values are set to their original properties' initial values.
+         * This property is shorthand for setting mask-image, mask-mode, mask-repeat, mask-position, mask-clip, mask-origin, mask-composite and mask-size.
+         * Omitted values are set to their original properties' initial values.
          */
         mask?: CSSWideKeyword | any;
 
         /**
-         * This property is shorthand for setting mask-border-source, mask-border-slice, mask-border-width, mask-border-outset, and mask-border-repeat. Omitted values are set to their original properties' initial values.
+         * This property is shorthand for setting mask-border-source, mask-border-slice, mask-border-width, mask-border-outset, and mask-border-repeat.
+         * Omitted values are set to their original properties' initial values.
          */
         maskBorder?: CSSWideKeyword | any;
 
         /**
-         * This property specifies how the images for the sides and the middle part of the mask image are scaled and tiled. The first keyword applies to the horizontal sides, the second one applies to the vertical ones. If the second keyword is absent, it is assumed to be the same as the first, similar to the CSS border-image-repeat property.
+         * This property specifies how the images for the sides and the middle part of the mask image are scaled and tiled.
+         * The first keyword applies to the horizontal sides, the second one applies to the vertical ones.
+         * If the second keyword is absent, it is assumed to be the same as the first, similar to the CSS border-image-repeat property.
          */
         maskBorderRepeat?: CSSWideKeyword | any;
 
         /**
-         * This property specifies inward offsets from the top, right, bottom, and left edges of the mask image, dividing it into nine regions: four corners, four edges, and a middle. The middle image part is discarded and treated as fully transparent black unless the fill keyword is present. The four values set the top, right, bottom and left offsets in that order, similar to the CSS border-image-slice property.
+         * This property specifies inward offsets from the top, right, bottom, and left edges of the mask image,
+         * dividing it into nine regions: four corners, four edges, and a middle.
+         * The middle image part is discarded and treated as fully transparent black unless the fill keyword is present.
+         * The four values set the top, right, bottom and left offsets in that order, similar to the CSS border-image-slice property.
          */
         maskBorderSlice?: CSSWideKeyword | any;
 
@@ -1476,22 +1584,28 @@ declare namespace React {
         maskBorderWidth?: CSSWideKeyword | any;
 
         /**
-         * Determines the mask painting area, which defines the area that is affected by the mask. The painted content of an element may be restricted to this area.
+         * Determines the mask painting area, which defines the area that is affected by the mask.
+         * The painted content of an element may be restricted to this area.
          */
         maskClip?: CSSWideKeyword | any;
 
         /**
-         * For elements rendered as a single box, specifies the mask positioning area. For elements rendered as multiple boxes (e.g., inline boxes on several lines, boxes on several pages) specifies which boxes box-decoration-break operates on to determine the mask positioning area(s).
+         * For elements rendered as a single box, specifies the mask positioning area.
+         * For elements rendered as multiple boxes (e.g., inline boxes on several lines, boxes on several pages)
+         * specifies which boxes box-decoration-break operates on to determine the mask positioning area(s).
          */
         maskOrigin?: CSSWideKeyword | any;
 
         /**
-         * This property must not be used. It is no longer included in any standard or standard track specification, nor is it implemented in any browser. It is only used when the text-align-last property is set to size. It controls allowed adjustments of font-size to fit line content.
+         * This property must not be used. It is no longer included in any standard or standard track specification,
+         * nor is it implemented in any browser. It is only used when the text-align-last property is set to size.
+         * It controls allowed adjustments of font-size to fit line content.
          */
         maxFontSize?: CSSWideKeyword | any;
 
         /**
-         * Sets the maximum height for an element. It prevents the height of the element to exceed the specified value. If min-height is specified and is greater than max-height, max-height is overridden.
+         * Sets the maximum height for an element. It prevents the height of the element to exceed the specified value.
+         * If min-height is specified and is greater than max-height, max-height is overridden.
          */
         maxHeight?: CSSWideKeyword | any;
 
@@ -1501,7 +1615,8 @@ declare namespace React {
         maxWidth?: CSSWideKeyword | any;
 
         /**
-         * Sets the minimum height for an element. It prevents the height of the element to be smaller than the specified value. The value of min-height overrides both max-height and height.
+         * Sets the minimum height for an element. It prevents the height of the element to be smaller than the specified value.
+         * The value of min-height overrides both max-height and height.
          */
         minHeight?: CSSWideKeyword | any;
 
@@ -1531,10 +1646,13 @@ declare namespace React {
         orphans?: CSSWideKeyword | number;
 
         /**
-         * The CSS outline property is a shorthand property for setting one or more of the individual outline properties outline-style, outline-width and outline-color in a single rule. In most cases the use of this shortcut is preferable and more convenient.
+         * The CSS outline property is a shorthand property for setting one or more of the individual outline properties outline-style,
+         * outline-width and outline-color in a single rule. In most cases the use of this shortcut is preferable and more convenient.
          * Outlines differ from borders in the following ways:
          *      •       Outlines do not take up space, they are drawn above the content.
-         *      •       Outlines may be non-rectangular. They are rectangular in Gecko/Firefox. Internet Explorer attempts to place the smallest contiguous outline around all elements or shapes that are indicated to have an outline. Opera draws a non-rectangular shape around a construct.
+         *      •       Outlines may be non-rectangular. They are rectangular in Gecko/Firefox.
+         *              Internet Explorer attempts to place the smallest contiguous outline around all elements or shapes that are indicated to have an outline.
+         *              Opera draws a non-rectangular shape around a construct.
          */
         outline?: CSSWideKeyword | any;
 
@@ -1549,7 +1667,8 @@ declare namespace React {
         outlineOffset?: CSSWideKeyword | any;
 
         /**
-         * The overflow property controls how extra content exceeding the bounding box of an element is rendered. It can be used in conjunction with an element that has a fixed width and height, to eliminate text-induced page distortion.
+         * The overflow property controls how extra content exceeding the bounding box of an element is rendered.
+         * It can be used in conjunction with an element that has a fixed width and height, to eliminate text-induced page distortion.
          */
         overflow?: CSSWideKeyword | "auto" | "hidden" | "scroll" | "visible";
 
@@ -1569,72 +1688,99 @@ declare namespace React {
         overflowY?: CSSWideKeyword | "auto" | "hidden" | "scroll" | "visible";
 
         /**
-         * The padding optional CSS property sets the required padding space on one to four sides of an element. The padding area is the space between an element and its border. Negative values are not allowed but decimal values are permitted. The element size is treated as fixed, and the content of the element shifts toward the center as padding is increased.
+         * The padding optional CSS property sets the required padding space on one to four sides of an element.
+         * The padding area is the space between an element and its border. Negative values are not allowed but decimal values are permitted.
+         * The element size is treated as fixed, and the content of the element shifts toward the center as padding is increased.
          * The padding property is a shorthand to avoid setting each side separately (padding-top, padding-right, padding-bottom, padding-left).
          */
         padding?: CSSWideKeyword | any;
 
         /**
-         * The padding-bottom CSS property of an element sets the padding space required on the bottom of an element. The padding area is the space between the content of the element and its border. Contrary to margin-bottom values, negative values of padding-bottom are invalid.
+         * The padding-bottom CSS property of an element sets the padding space required on the bottom of an element.
+         * The padding area is the space between the content of the element and its border.
+         * Contrary to margin-bottom values, negative values of padding-bottom are invalid.
          */
         paddingBottom?: CSSWideKeyword | any;
 
         /**
-         * The padding-left CSS property of an element sets the padding space required on the left side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-left values, negative values of padding-left are invalid.
+         * The padding-left CSS property of an element sets the padding space required on the left side of an element.
+         * The padding area is the space between the content of the element and its border.
+         * Contrary to margin-left values, negative values of padding-left are invalid.
          */
         paddingLeft?: CSSWideKeyword | any;
 
         /**
-         * The padding-right CSS property of an element sets the padding space required on the right side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-right values, negative values of padding-right are invalid.
+         * The padding-right CSS property of an element sets the padding space required on the right side of an element.
+         * The padding area is the space between the content of the element and its border.
+         * Contrary to margin-right values, negative values of padding-right are invalid.
          */
         paddingRight?: CSSWideKeyword | any;
 
         /**
-         * The padding-top CSS property of an element sets the padding space required on the top of an element. The padding area is the space between the content of the element and its border. Contrary to margin-top values, negative values of padding-top are invalid.
+         * The padding-top CSS property of an element sets the padding space required on the top of an element.
+         * The padding area is the space between the content of the element and its border.
+         * Contrary to margin-top values, negative values of padding-top are invalid.
          */
         paddingTop?: CSSWideKeyword | any;
 
         /**
-         * The page-break-after property is supported in all major browsers. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         * The page-break-after property is supported in all major browsers. With CSS3, page-break-* properties are only aliases of the break-* properties.
+         * The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
          */
         pageBreakAfter?: CSSWideKeyword | any;
 
         /**
-         * The page-break-before property sets the page-breaking behavior before an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         * The page-break-before property sets the page-breaking behavior before an element.
+         * With CSS3, page-break-* properties are only aliases of the break-* properties.
+         * The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
          */
         pageBreakBefore?: CSSWideKeyword | any;
 
         /**
-         * Sets the page-breaking behavior inside an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+         * Sets the page-breaking behavior inside an element. With CSS3, page-break-* properties are only aliases of the break-* properties.
+         * The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
          */
         pageBreakInside?: CSSWideKeyword | any;
 
         /**
-         * The pause property determines how long a speech media agent should pause before and after presenting an element. It is a shorthand for the pause-before and pause-after properties.
+         * The pause property determines how long a speech media agent should pause before and after presenting an element.
+         * It is a shorthand for the pause-before and pause-after properties.
          */
         pause?: CSSWideKeyword | any;
 
         /**
-         * The pause-after property determines how long a speech media agent should pause after presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
+         * The pause-after property determines how long a speech media agent should pause after presenting an element.
+         * It may be replaced by the shorthand property pause, which sets pause time before and after.
          */
         pauseAfter?: CSSWideKeyword | any;
 
         /**
-         * The pause-before property determines how long a speech media agent should pause before presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
+         * The pause-before property determines how long a speech media agent should pause before presenting an element.
+         * It may be replaced by the shorthand property pause, which sets pause time before and after.
          */
         pauseBefore?: CSSWideKeyword | any;
 
         /**
          * The perspective property defines how far an element is placed from the view on the z-axis, from the screen to the viewer.
-         * Perspective defines how an object is viewed. In graphic arts, perspective is the representation on a flat surface of what the viewer's eye would see in a 3D space. (See Wikipedia for more information about graphical perspective and for related illustrations.)
-         * The illusion of perspective on a flat surface, such as a computer screen, is created by projecting points on the flat surface as they would appear if the flat surface were a window through which the viewer was looking at the object. In discussion of virtual environments, this flat surface is called a projection plane.
+         * Perspective defines how an object is viewed. In graphic arts, perspective is the representation on a flat surface of what the viewer's eye would see in a 3D space.
+         * (See Wikipedia for more information about graphical perspective and for related illustrations.)
+         * The illusion of perspective on a flat surface, such as a computer screen,
+         * is created by projecting points on the flat surface as they would appear if the flat surface were a window
+         * through which the viewer was looking at the object. In discussion of virtual environments, this flat surface is called a projection plane.
          */
         perspective?: CSSWideKeyword | any;
 
         /**
-         * The perspective-origin property establishes the origin for the perspective property. It effectively sets the X and Y position at which the viewer appears to be looking at the children of the element.
-         * When used with perspective, perspective-origin changes the appearance of an object, as if a viewer were looking at it from a different origin. An object appears differently if a viewer is looking directly at it versus looking at it from below, above, or from the side. Thus, the perspective-origin is like a vanishing point.
-         * The default value of perspective-origin is 50% 50%. This displays an object as if the viewer's eye were positioned directly at the center of the screen, both top-to-bottom and left-to-right. A value of 0% 0% changes the object as if the viewer was looking toward the top left angle. A value of 100% 100% changes the appearance as if viewed toward the bottom right angle.
+         * The perspective-origin property establishes the origin for the perspective property.
+         * It effectively sets the X and Y position at which the viewer appears to be looking at the children of the element.
+         * When used with perspective, perspective-origin changes the appearance of an object,
+         * as if a viewer were looking at it from a different origin.
+         * An object appears differently if a viewer is looking directly at it versus looking at it from below, above, or from the side.
+         * Thus, the perspective-origin is like a vanishing point.
+         * The default value of perspective-origin is 50% 50%.
+         * This displays an object as if the viewer's eye were positioned directly at the center of the screen, both top-to-bottom and left-to-right.
+         * A value of 0% 0% changes the object as if the viewer was looking toward the top left angle.
+         * A value of 100% 100% changes the appearance as if viewed toward the bottom right angle.
          */
         perspectiveOrigin?: CSSWideKeyword | any;
 
@@ -1644,13 +1790,15 @@ declare namespace React {
         pointerEvents?: CSSWideKeyword | any;
 
         /**
-         * The position property controls the type of positioning used by an element within its parent elements. The effect of the position property depends on a lot of factors, for example the position property of parent elements.
+         * The position property controls the type of positioning used by an element within its parent elements.
+         * The effect of the position property depends on a lot of factors, for example the position property of parent elements.
          */
         position?: CSSWideKeyword | "static" | "relative" | "absolute" | "fixed" | "sticky";
 
         /**
          * Obsolete: unsupported.
-         * This property determines whether or not a full-width punctuation mark character should be trimmed if it appears at the beginning of a line, so that its "ink" lines up with the first glyph in the line above and below.
+         * This property determines whether or not a full-width punctuation mark character should be trimmed if it appears at the beginning of a line,
+         * so that its "ink" lines up with the first glyph in the line above and below.
          */
         punctuationTrim?: CSSWideKeyword | any;
 
@@ -1660,17 +1808,20 @@ declare namespace React {
         quotes?: CSSWideKeyword | any;
 
         /**
-         * Controls whether the last region in a chain displays additional 'overset' content according its default overflow property, or if it displays a fragment of content as if it were flowing into a subsequent region.
+         * Controls whether the last region in a chain displays additional 'overset' content according its default overflow property,
+         * or if it displays a fragment of content as if it were flowing into a subsequent region.
          */
         regionFragment?: CSSWideKeyword | any;
 
         /**
-         * The rest-after property determines how long a speech media agent should pause after presenting an element's main content, before presenting that element's exit cue sound. It may be replaced by the shorthand property rest, which sets rest time before and after.
+         * The rest-after property determines how long a speech media agent should pause after presenting an element's main content,
+         * before presenting that element's exit cue sound. It may be replaced by the shorthand property rest, which sets rest time before and after.
          */
         restAfter?: CSSWideKeyword | any;
 
         /**
-         * The rest-before property determines how long a speech media agent should pause after presenting an intro cue sound for an element, before presenting that element's main content. It may be replaced by the shorthand property rest, which sets rest time before and after.
+         * The rest-before property determines how long a speech media agent should pause after presenting an intro cue sound for an element,
+         * before presenting that element's main content. It may be replaced by the shorthand property rest, which sets rest time before and after.
          */
         restBefore?: CSSWideKeyword | any;
 
@@ -1684,22 +1835,29 @@ declare namespace React {
         rubyPosition?: CSSWideKeyword | any;
 
         /**
-         * Defines the alpha channel threshold used to extract a shape from an image. Can be thought of as a "minimum opacity" threshold; that is, a value of 0.5 means that the shape will enclose all the pixels that are more than 50% opaque.
+         * Defines the alpha channel threshold used to extract a shape from an image. Can be thought of as a "minimum opacity" threshold;
+         * that is, a value of 0.5 means that the shape will enclose all the pixels that are more than 50% opaque.
          */
         shapeImageThreshold?: CSSWideKeyword | any;
 
         /**
-         * A future level of CSS Shapes will define a shape-inside property, which will define a shape to wrap content within the element. See Editor's Draft <http://dev.w3.org/csswg/css-shapes/> and CSSWG wiki page on next-level plans <http://wiki.csswg.org/spec/css-shapes>
+         * A future level of CSS Shapes will define a shape-inside property, which will define a shape to wrap content within the element.
+         * See Editor's Draft <http://dev.w3.org/csswg/css-shapes/> and CSSWG wiki page on next-level plans <http://wiki.csswg.org/spec/css-shapes>
          */
         shapeInside?: CSSWideKeyword | any;
 
         /**
-         * Adds a margin to a shape-outside. In effect, defines a new shape that is the smallest contour around all the points that are the shape-margin distance outward perpendicular to each point on the underlying shape. For points where a perpendicular direction is not defined (e.g., a triangle corner), takes all points on a circle centered at the point and with a radius of the shape-margin distance. This property accepts only non-negative values.
+         * Adds a margin to a shape-outside. In effect, defines a new shape that is the smallest contour around all the points
+         * that are the shape-margin distance outward perpendicular to each point on the underlying shape.
+         * For points where a perpendicular direction is not defined (e.g., a triangle corner),
+         * takes all points on a circle centered at the point and with a radius of the shape-margin distance.
+         * This property accepts only non-negative values.
          */
         shapeMargin?: CSSWideKeyword | any;
 
         /**
-         * Declares a shape around which text should be wrapped, with possible modifications from the shape-margin property. The shape defined by shape-outside and shape-margin changes the geometry of a float element's float area.
+         * Declares a shape around which text should be wrapped, with possible modifications from the shape-margin property.
+         * The shape defined by shape-outside and shape-margin changes the geometry of a float element's float area.
          */
         shapeOutside?: CSSWideKeyword | any;
 
@@ -1709,7 +1867,8 @@ declare namespace React {
         speak?: CSSWideKeyword | any;
 
         /**
-         * The speak-as property determines how the speech synthesizer interprets the content: words as whole words or as a sequence of letters, numbers as a numerical value or a sequence of digits, punctuation as pauses in speech or named punctuation characters.
+         * The speak-as property determines how the speech synthesizer interprets the content: words as whole words or as a sequence of letters,
+         * numbers as a numerical value or a sequence of digits, punctuation as pauses in speech or named punctuation characters.
          */
         speakAs?: CSSWideKeyword | any;
 
@@ -1736,7 +1895,8 @@ declare namespace React {
         tableLayout?: CSSWideKeyword | any;
 
         /**
-         * The text-align CSS property describes how inline content like text is aligned in its parent block element. text-align does not control the alignment of block elements itself, only their inline content.
+         * The text-align CSS property describes how inline content like text is aligned in its parent block element.
+         * text-align does not control the alignment of block elements itself, only their inline content.
          */
         textAlign?: CSSWideKeyword | any;
 
@@ -1773,14 +1933,17 @@ declare namespace React {
         textDecorationSkip?: CSSWideKeyword | any;
 
         /**
-         * This property specifies the style of the text decoration line drawn on the specified element. The intended meaning for the values are the same as those of the border-style-properties.
+         * This property specifies the style of the text decoration line drawn on the specified element.
+         * The intended meaning for the values are the same as those of the border-style-properties.
          */
         textDecorationStyle?: CSSWideKeyword | any;
 
         textDecorationUnderline?: CSSWideKeyword | any;
 
         /**
-         * The text-emphasis property will apply special emphasis marks to the elements text. Slightly similar to the text-decoration property only that this property can have affect on the line-height. It also is noted that this is shorthand for text-emphasis-style and for text-emphasis-color.
+         * The text-emphasis property will apply special emphasis marks to the elements text.
+         * Slightly similar to the text-decoration property only that this property can have affect on the line-height.
+         * It also is noted that this is shorthand for text-emphasis-style and for text-emphasis-color.
          */
         textEmphasis?: CSSWideKeyword | any;
 
@@ -1795,12 +1958,16 @@ declare namespace React {
         textEmphasisStyle?: CSSWideKeyword | any;
 
         /**
-         * This property helps determine an inline box's block-progression dimension, derived from the text-height and font-size properties for non-replaced elements, the height or the width for replaced elements, and the stacked block-progression dimension for inline-block elements. The block-progression dimension determines the position of the padding, border and margin for the element.
+         * This property helps determine an inline box's block-progression dimension,
+         * derived from the text-height and font-size properties for non-replaced elements,
+         * the height or the width for replaced elements, and the stacked block-progression dimension for inline-block elements.
+         * The block-progression dimension determines the position of the padding, border and margin for the element.
          */
         textHeight?: CSSWideKeyword | any;
 
         /**
-         * Specifies the amount of space horizontally that should be left on the first line of the text of an element. This horizontal spacing is at the beginning of the first line and is in respect to the left edge of the containing block box.
+         * Specifies the amount of space horizontally that should be left on the first line of the text of an element.
+         * This horizontal spacing is at the beginning of the first line and is in respect to the left edge of the containing block box.
          */
         textIndent?: CSSWideKeyword | any;
 
@@ -1809,7 +1976,8 @@ declare namespace React {
         textKashidaSpace?: CSSWideKeyword | any;
 
         /**
-         * The text-line-through property is a shorthand property for text-line-through-style, text-line-through-color and text-line-through-mode. (Considered obsolete; use text-decoration instead.)
+         * The text-line-through property is a shorthand property for text-line-through-style, text-line-through-color and text-line-through-mode.
+         * (Considered obsolete; use text-decoration instead.)
          */
         textLineThrough?: CSSWideKeyword | any;
 
@@ -1837,7 +2005,9 @@ declare namespace React {
         textLineThroughWidth?: CSSWideKeyword | any;
 
         /**
-         * The text-overflow shorthand CSS property determines how overflowed content that is not displayed is signaled to the users. It can be clipped, display an ellipsis ('…', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string. It covers the two long-hand properties text-overflow-mode and text-overflow-ellipsis
+         * The text-overflow shorthand CSS property determines how overflowed content that is not displayed is signaled to the users.
+         * It can be clipped, display an ellipsis ('…', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string.
+         * It covers the two long-hand properties text-overflow-mode and text-overflow-ellipsis
          */
         textOverflow?: CSSWideKeyword | any;
 
@@ -1867,7 +2037,8 @@ declare namespace React {
         textOverlineWidth?: CSSWideKeyword | any;
 
         /**
-         * The text-rendering CSS property provides information to the browser about how to optimize when rendering text. Options are: legibility, speed or geometric precision.
+         * The text-rendering CSS property provides information to the browser about how to optimize when rendering text.
+         * Options are: legibility, speed or geometric precision.
          */
         textRendering?: CSSWideKeyword | any;
 
@@ -1877,7 +2048,8 @@ declare namespace React {
         textScript?: CSSWideKeyword | any;
 
         /**
-         * The CSS text-shadow property applies one or more drop shadows to the text and <text-decorations> of an element. Each shadow is specified as an offset from the text, along with optional color and blur radius values.
+         * The CSS text-shadow property applies one or more drop shadows to the text and <text-decorations> of an element.
+         * Each shadow is specified as an offset from the text, along with optional color and blur radius values.
          */
         textShadow?: CSSWideKeyword | any;
 
@@ -1899,7 +2071,9 @@ declare namespace React {
         textUnderlineStyle?: CSSWideKeyword | any;
 
         /**
-         * This property specifies how far an absolutely positioned box's top margin edge is offset below the top edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the top edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
+         * This property specifies how far an absolutely positioned box's top margin edge is offset below the top edge of the box's containing block.
+         * For relatively positioned boxes, the offset is with respect to the top edges of the box itself (i.e., the box is given a position in the normal flow,
+         * then offset from that position according to these properties).
          */
         top?: CSSWideKeyword | any;
 
@@ -1909,7 +2083,8 @@ declare namespace React {
         touchAction?: CSSWideKeyword | any;
 
         /**
-         * CSS transforms allow elements styled with CSS to be transformed in two-dimensional or three-dimensional space. Using this property, elements can be translated, rotated, scaled, and skewed. The value list may consist of 2D and/or 3D transform values.
+         * CSS transforms allow elements styled with CSS to be transformed in two-dimensional or three-dimensional space.
+         * Using this property, elements can be translated, rotated, scaled, and skewed. The value list may consist of 2D and/or 3D transform values.
          */
         transform?: CSSWideKeyword | any;
 
@@ -1929,12 +2104,14 @@ declare namespace React {
         transformStyle?: CSSWideKeyword | any;
 
         /**
-         * The transition CSS property is a shorthand property for transition-property, transition-duration, transition-timing-function, and transition-delay. It allows to define the transition between two states of an element.
+         * The transition CSS property is a shorthand property for transition-property, transition-duration, transition-timing-function,
+         * and transition-delay. It allows to define the transition between two states of an element.
          */
         transition?: CSSWideKeyword | any;
 
         /**
-         * Defines when the transition will start. A value of ‘0s’ means the transition will execute as soon as the property is changed. Otherwise, the value specifies an offset from the moment the property is changed, and the transition will delay execution by that offset.
+         * Defines when the transition will start. A value of ‘0s’ means the transition will execute as soon as the property is changed.
+         * Otherwise, the value specifies an offset from the moment the property is changed, and the transition will delay execution by that offset.
          */
         transitionDelay?: CSSWideKeyword | any;
 
@@ -1974,7 +2151,8 @@ declare namespace React {
         userInput?: CSSWideKeyword | any;
 
         /**
-         * The vertical-align property controls how inline elements or text are vertically aligned compared to the baseline. If this property is used on table-cells it controls the vertical alignment of content of the table cell.
+         * The vertical-align property controls how inline elements or text are vertically aligned compared to the baseline.
+         * If this property is used on table-cells it controls the vertical alignment of content of the table cell.
          */
         verticalAlign?: CSSWideKeyword | any;
 
@@ -1989,22 +2167,34 @@ declare namespace React {
         voiceBalance?: CSSWideKeyword | any;
 
         /**
-         * The voice-duration property allows the author to explicitly set the amount of time it should take a speech synthesizer to read an element's content, for example to allow the speech to be synchronized with other media. With a value of auto (the default) the length of time it takes to read the content is determined by the content itself and the voice-rate property.
+         * The voice-duration property allows the author to explicitly set the amount of time it should take a speech synthesizer to read an element's content,
+         * for example to allow the speech to be synchronized with other media.
+         * With a value of auto (the default) the length of time it takes to read the content is determined by the content itself and the voice-rate property.
          */
         voiceDuration?: CSSWideKeyword | any;
 
         /**
-         * The voice-family property sets the speaker's voice used by a speech media agent to read an element. The speaker may be specified as a named character (to match a voice option in the speech reading software) or as a generic description of the age and gender of the voice. Similar to the font-family property for visual media, a comma-separated list of fallback options may be given in case the speech reader does not recognize the character name or cannot synthesize the requested combination of generic properties.
+         * The voice-family property sets the speaker's voice used by a speech media agent to read an element.
+         * The speaker may be specified as a named character (to match a voice option in the speech reading software)
+         * or as a generic description of the age and gender of the voice.
+         * Similar to the font-family property for visual media,
+         * a comma-separated list of fallback options may be given in case the speech reader does not recognize the character name
+         * or cannot synthesize the requested combination of generic properties.
          */
         voiceFamily?: CSSWideKeyword | any;
 
         /**
-         * The voice-pitch property sets pitch or tone (high or low) for the synthesized speech when reading an element; the pitch may be specified absolutely or relative to the normal pitch for the voice-family used to read the text.
+         * The voice-pitch property sets pitch or tone (high or low) for the synthesized speech when reading an element;
+         * the pitch may be specified absolutely or relative to the normal pitch for the voice-family used to read the text.
          */
         voicePitch?: CSSWideKeyword | any;
 
         /**
-         * The voice-range property determines how much variation in pitch or tone will be created by the speech synthesize when reading an element. Emphasized text, grammatical structures and punctuation may all be rendered as changes in pitch, this property determines how strong or obvious those changes are; large ranges are associated with enthusiastic or emotional speech, while small ranges are associated with flat or mechanical speech.
+         * The voice-range property determines how much variation in pitch or tone will be created by the speech synthesize when reading an element.
+         * Emphasized text, grammatical structures and punctuation may all be rendered as changes in pitch,
+         * this property determines how strong or obvious those changes are;
+         * large ranges are associated with enthusiastic or emotional speech,
+         * while small ranges are associated with flat or mechanical speech.
          */
         voiceRange?: CSSWideKeyword | any;
 
@@ -2046,7 +2236,8 @@ declare namespace React {
         width?: CSSWideKeyword | any;
 
         /**
-         * The word-break property is often used when there is long generated content that is strung together without and spaces or hyphens to beak apart. A common case of this is when there is a long URL that does not have any hyphens. This case could potentially cause the breaking of the layout as it could extend past the parent element.
+         * The word-break property is often used when there is long generated content that is strung together without and spaces or hyphens to beak apart.
+         * A common case of this is when there is a long URL that does not have any hyphens. This case could potentially cause the breaking of the layout as it could extend past the parent element.
          */
         wordBreak?: CSSWideKeyword | any;
 
@@ -2291,7 +2482,8 @@ declare namespace React {
         accentHeight?: number | string;
         accumulate?: "none" | "sum";
         additive?: "replace" | "sum";
-        alignmentBaseline?: "auto" | "baseline" | "before-edge" | "text-before-edge" | "middle" | "central" | "after-edge" | "text-after-edge" | "ideographic" | "alphabetic" | "hanging" | "mathematical" | "inherit";
+        alignmentBaseline?: "auto" | "baseline" | "before-edge" | "text-before-edge" | "middle" | "central" | "after-edge" |
+        "text-after-edge" | "ideographic" | "alphabetic" | "hanging" | "mathematical" | "inherit";
         allowReorder?: "no" | "yes";
         alphabetic?: number | string;
         amplitude?: number | string;
@@ -2679,15 +2871,13 @@ declare namespace React {
     // React.PropTypes
     // ----------------------------------------------------------------------
 
-    interface Validator<T> {
-        (object: T, key: string, componentName: string, ...rest: any[]): Error | null;
-    }
+    type Validator<T> = (object: T, key: string, componentName: string, ...rest: any[]) => Error | null;
 
     interface Requireable<T> extends Validator<T> {
         isRequired: Validator<T>;
     }
 
-    type ValidationMap<T> = { [K in keyof T]?: Validator<T> };
+    type ValidationMap<T> = {[K in keyof T]?: Validator<T> };
 
     interface ReactPropTypes {
         any: Requireable<any>;
@@ -2701,7 +2891,7 @@ declare namespace React {
         element: Requireable<any>;
         instanceOf(expectedClass: {}): Requireable<any>;
         oneOf(types: any[]): Requireable<any>;
-        oneOfType(types: Validator<any>[]): Requireable<any>;
+        oneOfType(types: Array<Validator<any>>): Requireable<any>;
         arrayOf(type: Validator<any>): Requireable<any>;
         objectOf(type: Validator<any>): Requireable<any>;
         shape(type: ValidationMap<any>): Requireable<any>;
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 27acc07d34..9274602c82 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -139,13 +139,13 @@ interface SCProps {
 
 function StatelessComponent(props: SCProps) {
     return props.foo ? React.DOM.div(null, props.foo) : null;
-};
+}
 namespace StatelessComponent {
-    export var displayName = "StatelessComponent";
-    export var defaultProps = { foo: 42 };
+    export const displayName = "StatelessComponent";
+    export const defaultProps = { foo: 42 };
 }
 
-var StatelessComponent2: React.SFC<SCProps> =
+const StatelessComponent2: React.SFC<SCProps> =
     // props is contextually typed
     props => React.DOM.div(null, props.foo);
 StatelessComponent2.displayName = "StatelessComponent2";
@@ -153,138 +153,125 @@ StatelessComponent2.defaultProps = {
     foo: 42
 };
 
-var StatelessComponent3: React.SFC<SCProps> =
+const StatelessComponent3: React.SFC<SCProps> =
     // allows usage of props.children
     // allows null return
     props => props.foo ? React.DOM.div(null, props.foo, props.children) : null;
 
 // React.createFactory
-var factory: React.CFactory<Props, ModernComponent> =
+const factory: React.CFactory<Props, ModernComponent> =
     React.createFactory(ModernComponent);
-var factoryElement: React.CElement<Props, ModernComponent> =
+const factoryElement: React.CElement<Props, ModernComponent> =
     factory(props);
 
-var statelessFactory: React.SFCFactory<SCProps> =
+const statelessFactory: React.SFCFactory<SCProps> =
     React.createFactory(StatelessComponent);
-var statelessFactoryElement: React.SFCElement<SCProps> =
+const statelessFactoryElement: React.SFCElement<SCProps> =
     statelessFactory(props);
 
-var classicFactory: React.ClassicFactory<Props> =
+const classicFactory: React.ClassicFactory<Props> =
     React.createFactory(ClassicComponent);
-var classicFactoryElement: React.ClassicElement<Props> =
+const classicFactoryElement: React.ClassicElement<Props> =
     classicFactory(props);
 
-var domFactory: React.DOMFactory<React.DOMAttributes<{}>, Element> =
-    React.createFactory("foo");
-var domFactoryElement: React.DOMElement<React.DOMAttributes<{}>, Element> =
+const domFactory: React.DOMFactory<React.DOMAttributes<{}>, Element> =
+    React.createFactory("div");
+const domFactoryElement: React.DOMElement<React.DOMAttributes<{}>, Element> =
     domFactory();
 
 // React.createElement
-var element: React.CElement<Props, ModernComponent> =
-    React.createElement(ModernComponent, props);
-var elementNoState: React.CElement<Props, ModernComponentNoState> =
-    React.createElement(ModernComponentNoState, props);
-var statelessElement: React.SFCElement<SCProps> =
-    React.createElement(StatelessComponent, props);
-var classicElement: React.ClassicElement<Props> =
-    React.createElement(ClassicComponent, props);
-var domElement: React.ReactHTMLElement<HTMLDivElement> =
-    React.createElement("div");
-var htmlElement = React.createElement("input", { type: "text" });
-var svgElement = React.createElement("svg", { accentHeight: 12 });
+const element: React.CElement<Props, ModernComponent> = React.createElement(ModernComponent, props);
+const elementNoState: React.CElement<Props, ModernComponentNoState> = React.createElement(ModernComponentNoState, props);
+const statelessElement: React.SFCElement<SCProps> = React.createElement(StatelessComponent, props);
+const classicElement: React.ClassicElement<Props> = React.createElement(ClassicComponent, props);
+const domElement: React.ReactHTMLElement<HTMLDivElement> = React.createElement("div");
+const htmlElement = React.createElement("input", { type: "text" });
+const svgElement = React.createElement("svg", { accentHeight: 12 });
 
 // React.cloneElement
-var clonedElement: React.CElement<Props, ModernComponent> =
-    React.cloneElement(element, { foo: 43 });
+const clonedElement: React.CElement<Props, ModernComponent> = React.cloneElement(element, { foo: 43 });
 
 React.cloneElement(element, {});
 React.cloneElement(element, {}, null);
 
-var clonedElement2: React.CElement<Props, ModernComponent> =
+const clonedElement2: React.CElement<Props, ModernComponent> =
     // known problem: cloning with key or ref requires cast
-    React.cloneElement(element, <React.ClassAttributes<ModernComponent>>{
+    React.cloneElement(element, <React.ClassAttributes<ModernComponent>> {
         ref: c => c && c.reset()
     });
-var clonedElement3: React.CElement<Props, ModernComponent> =
-    React.cloneElement(element, <{ foo: number } & React.Attributes>{
+const clonedElement3: React.CElement<Props, ModernComponent> =
+    React.cloneElement(element, <{ foo: number } & React.Attributes> {
         key: "8eac7",
         foo: 55
     });
-var clonedStatelessElement: React.SFCElement<SCProps> =
+const clonedStatelessElement: React.SFCElement<SCProps> =
     // known problem: cloning with optional props don't work properly
     // workaround: cast to actual props type
-    React.cloneElement(statelessElement, <SCProps>{ foo: 44 });
-var clonedClassicElement: React.ClassicElement<Props> =
+    React.cloneElement(statelessElement, <SCProps> { foo: 44 });
+const clonedClassicElement: React.ClassicElement<Props> =
     React.cloneElement(classicElement, props);
-var clonedDOMElement: React.ReactHTMLElement<HTMLDivElement> =
+const clonedDOMElement: React.ReactHTMLElement<HTMLDivElement> =
     React.cloneElement(domElement, {
         className: "clonedElement"
     });
 
 // React.render
-var component: ModernComponent =
-    ReactDOM.render(element, container);
-var componentNullContainer: ModernComponent =
-    ReactDOM.render(element, null);
+const component: ModernComponent = ReactDOM.render(element, container);
+const componentNullContainer: ModernComponent = ReactDOM.render(element, null);
 
-var componentElementOrNull: ModernComponent =
-    ReactDOM.render(element, document.getElementById("anelement"));
-var componentNoState: ModernComponentNoState =
-    ReactDOM.render(elementNoState, container);
-var componentNoStateElementOrNull: ModernComponentNoState =
-    ReactDOM.render(elementNoState, document.getElementById("anelement"));
-var classicComponent: React.ClassicComponent<Props> =
-    ReactDOM.render(classicElement, container);
-var domComponent: Element =
-    ReactDOM.render(domElement, container);
+const componentElementOrNull: ModernComponent = ReactDOM.render(element, document.getElementById("anelement"));
+const componentNoState: ModernComponentNoState = ReactDOM.render(elementNoState, container);
+const componentNoStateElementOrNull: ModernComponentNoState = ReactDOM.render(elementNoState, document.getElementById("anelement"));
+const classicComponent: React.ClassicComponent<Props> = ReactDOM.render(classicElement, container);
+const domComponent: Element = ReactDOM.render(domElement, container);
 
 // Other Top-Level API
-var unmounted: boolean = ReactDOM.unmountComponentAtNode(container);
-var str: string = ReactDOMServer.renderToString(element);
-var markup: string = ReactDOMServer.renderToStaticMarkup(element);
-var notValid: boolean = React.isValidElement(props); // false
-var isValid = React.isValidElement(element); // true
-var domNode: Element = ReactDOM.findDOMNode(component);
+const unmounted: boolean = ReactDOM.unmountComponentAtNode(container);
+const str: string = ReactDOMServer.renderToString(element);
+const markup: string = ReactDOMServer.renderToStaticMarkup(element);
+const notValid: boolean = React.isValidElement(props); // false
+const isValid = React.isValidElement(element); // true
+let domNode: Element = ReactDOM.findDOMNode(component);
 domNode = ReactDOM.findDOMNode(domNode);
 
 //
 // React Elements
 // --------------------------------------------------------------------------
 
-var type: React.ComponentClass<Props> = element.type;
-var elementProps: Props = element.props;
-var key = element.key;
+const type: React.ComponentClass<Props> = element.type;
+const elementProps: Props = element.props;
+const key = element.key;
 
 //
 // React Components
 // --------------------------------------------------------------------------
 
-var displayName: string | undefined = ClassicComponent.displayName;
-var defaultProps: Props = ClassicComponent.getDefaultProps ? ClassicComponent.getDefaultProps() : <Props>{};
-var propTypes: React.ValidationMap<Props> | undefined = ClassicComponent.propTypes;
+const displayName: string | undefined = ClassicComponent.displayName;
+const defaultProps: Props = ClassicComponent.getDefaultProps ? ClassicComponent.getDefaultProps() : <Props> {};
+const propTypes: React.ValidationMap<Props> | undefined = ClassicComponent.propTypes;
 
 //
 // Component API
 // --------------------------------------------------------------------------
 
 // modern
-var componentState: State = component.state;
+const componentState: State = component.state;
 component.setState({ inputValue: "!!!" });
 component.forceUpdate();
 
 // classic
-var isMounted: boolean = classicComponent.isMounted();
+const isMounted: boolean = classicComponent.isMounted();
 classicComponent.replaceState({ inputValue: "???", seconds: 60 });
 
-var myComponent = <MyComponent>component;
+const myComponent = <MyComponent>component;
 myComponent.reset();
 
 //
 // Refs
 // --------------------------------------------------------------------------
 
-interface RCProps {
-}
+// tslint:disable:no-empty-interface
+interface RCProps { }
 
 class RefComponent extends React.Component<RCProps> {
     static create = React.createFactory(RefComponent);
@@ -292,33 +279,33 @@ class RefComponent extends React.Component<RCProps> {
     }
 }
 
-var componentRef: RefComponent | null = new RefComponent();
+let componentRef: RefComponent | null = new RefComponent();
 RefComponent.create({ ref: "componentRef" });
 // type of c should be inferred
 RefComponent.create({ ref: c => componentRef = c });
 componentRef.refMethod();
 
-var domNodeRef: Element | null;
+let domNodeRef: Element | null;
 React.DOM.div({ ref: "domRef" });
 // type of node should be inferred
 React.DOM.div({ ref: node => domNodeRef = node });
 
-var inputNodeRef: HTMLInputElement | null;
+let inputNodeRef: HTMLInputElement | null;
 React.DOM.input({ ref: node => inputNodeRef = <HTMLInputElement>node });
 
 //
 // Attributes
 // --------------------------------------------------------------------------
 
-var children: any[] = ["Hello world", [null], React.DOM.span(null)];
-var divStyle: React.CSSProperties = { // CSSProperties
+const children: any[] = ["Hello world", [null], React.DOM.span(null)];
+const divStyle: React.CSSProperties = { // CSSProperties
     flex: "1 1 main-size",
     backgroundImage: "url('hello.png')"
 };
-var htmlAttr: React.HTMLProps<HTMLElement> = {
+const htmlAttr: React.HTMLProps<HTMLElement> = {
     key: 36,
     ref: "htmlComponent",
-    children: children,
+    children,
     className: "test-attr",
     style: divStyle,
     slot: "HTMLComponent",
@@ -371,12 +358,11 @@ React.DOM.svg({
     })
 );
 
-
 //
 // React.PropTypes
 // --------------------------------------------------------------------------
 
-var PropTypesSpecification: React.ComponentSpec<any, any> = {
+const PropTypesSpecification: React.ComponentSpec<any, any> = {
     propTypes: {
         optionalArray: React.PropTypes.array,
         optionalBool: React.PropTypes.bool,
@@ -401,7 +387,7 @@ var PropTypesSpecification: React.ComponentSpec<any, any> = {
         }),
         requiredFunc: React.PropTypes.func.isRequired,
         requiredAny: React.PropTypes.any.isRequired,
-        customProp: function (props: any, propName: string, componentName: string): Error | null {
+        customProp(props: any, propName: string, componentName: string): Error | null {
             if (!/matchme/.test(props[propName])) {
                 return new Error("Validation failed!");
             }
@@ -428,7 +414,7 @@ var PropTypesSpecification: React.ComponentSpec<any, any> = {
 // ContextTypes
 // --------------------------------------------------------------------------
 
-var ContextTypesSpecification: React.ComponentSpec<any, any> = {
+const ContextTypesSpecification: React.ComponentSpec<any, any> = {
     contextTypes: {
         optionalArray: React.PropTypes.array,
         optionalBool: React.PropTypes.bool,
@@ -453,7 +439,7 @@ var ContextTypesSpecification: React.ComponentSpec<any, any> = {
         }),
         requiredFunc: React.PropTypes.func.isRequired,
         requiredAny: React.PropTypes.any.isRequired,
-        customProp: function (props: any, propName: string, componentName: string): Error | null {
+        customProp(props: any, propName: string, componentName: string): Error | null {
             if (!/matchme/.test(props[propName])) {
                 return new Error("Validation failed!");
             }
@@ -469,13 +455,13 @@ var ContextTypesSpecification: React.ComponentSpec<any, any> = {
 // React.Children
 // --------------------------------------------------------------------------
 
-var mappedChildrenArray: number[] =
-    React.Children.map<number>(children, (child) => { return 42; });
+const mappedChildrenArray: number[] =
+    React.Children.map<number>(children, (child) => 42);
 React.Children.forEach(children, (child) => { });
-var nChildren: number = React.Children.count(children);
-var onlyChild: React.ReactElement<any> = React.Children.only(React.DOM.div()); // ok
+const nChildren: number = React.Children.count(children);
+let onlyChild: React.ReactElement<any> = React.Children.only(React.DOM.div()); // ok
 onlyChild = React.Children.only([null, [[["Hallo"], true]], false]); // error
-var childrenToArray: React.ReactChild[] = React.Children.toArray(children);
+const childrenToArray: React.ReactChild[] = React.Children.toArray(children);
 
 //
 // Example from http://facebook.github.io/react/
@@ -550,13 +536,13 @@ React.createFactory(CSSTransitionGroup)({
 // --------------------------------------------------------------------------
 React.createClass({
     mixins: [LinkedStateMixin],
-    getInitialState: function () {
+    getInitialState() {
         return {
             isChecked: false,
             message: "hello!"
         };
     },
-    render: function () {
+    render() {
         return React.DOM.div(null,
             React.DOM.input({
                 type: "checkbox",
@@ -575,7 +561,7 @@ React.createClass({
 // --------------------------------------------------------------------------
 Perf.start();
 Perf.stop();
-var measurements = Perf.getLastMeasurements();
+const measurements = Perf.getLastMeasurements();
 Perf.printInclusive(measurements);
 Perf.printExclusive(measurements);
 Perf.printWasted(measurements);
@@ -603,37 +589,37 @@ Perf.printDOM();
 // --------------------------------------------------------------------------
 React.createClass({
     mixins: [PureRenderMixin],
-    render: function () { return React.DOM.div(null); }
+    render() { return React.DOM.div(null); }
 });
 
 //
 // TestUtils addon
 // --------------------------------------------------------------------------
 
-var inst: ModernComponent = TestUtils.renderIntoDocument<ModernComponent>(element);
-var node: Element = TestUtils.renderIntoDocument(React.DOM.div());
+const inst: ModernComponent = TestUtils.renderIntoDocument<ModernComponent>(element);
+const node: Element = TestUtils.renderIntoDocument(React.DOM.div());
 
 TestUtils.Simulate.click(node);
 TestUtils.Simulate.change(node);
 TestUtils.Simulate.keyDown(node, { key: "Enter", cancelable: false });
 
-var renderer: TestUtils.ShallowRenderer = TestUtils.createRenderer();
+const renderer: TestUtils.ShallowRenderer = TestUtils.createRenderer();
 renderer.render(React.createElement(Timer));
-var output: React.ReactElement<React.Props<Timer>> =
+const output: React.ReactElement<React.Props<Timer>> =
     renderer.getRenderOutput();
 
-var foundComponent: ModernComponent = TestUtils.findRenderedComponentWithType(
+const foundComponent: ModernComponent = TestUtils.findRenderedComponentWithType(
     inst, ModernComponent);
-var foundComponents: ModernComponent[] = TestUtils.scryRenderedComponentsWithType(
+const foundComponents: ModernComponent[] = TestUtils.scryRenderedComponentsWithType(
     inst, ModernComponent);
 
 // ReactTestUtils custom type guards
 
-var emptyElement1: React.ReactElement<{}> = React.createElement(ModernComponent);
+const emptyElement1: React.ReactElement<{}> = React.createElement(ModernComponent);
 if (TestUtils.isElementOfType(emptyElement1, StatelessComponent)) {
     emptyElement1.props.foo;
 }
-var emptyElement2: React.ReactElement<{}> = React.createElement(StatelessComponent);
+const emptyElement2: React.ReactElement<{}> = React.createElement(StatelessComponent);
 if (TestUtils.isElementOfType(emptyElement2, StatelessComponent)) {
     emptyElement2.props.foo;
 }
@@ -662,7 +648,11 @@ React.createFactory(TransitionGroup)({ component: "div" });
     // => [1, 2, {a: [12, 13, 14, 15]}]
 
     let obj = { a: 5, b: 3 };
-    let newObj = update(obj, { b: { $apply: function (x) { return x * 2; } } });
+    let newObj = update(obj, {
+        b: {
+            $apply: (x) => x * 2
+        }
+    });
     // => {a: 5, b: 6}
     let newObj2 = update(obj, { b: { $set: obj.b * 2 } });
 
@@ -674,16 +664,16 @@ React.createFactory(TransitionGroup)({ component: "div" });
 // The SyntheticEvent.target.value should be accessible for onChange
 // --------------------------------------------------------------------------
 class SyntheticEventTargetValue extends React.Component<{}, { value: string }> {
-  constructor(props:{}) {
-    super(props);
-    this.state = { value: 'a' };
-  }
-  render() {
-    return React.DOM.textarea({
-      value: this.state.value,
-      onChange: e => this.setState({value: e.target.value})
-    });
-  }
+    constructor(props: {}) {
+        super(props);
+        this.state = { value: 'a' };
+    }
+    render() {
+        return React.DOM.textarea({
+            value: this.state.value,
+            onChange: e => this.setState({ value: e.target.value })
+        });
+    }
 }
 
 React.DOM.input({
@@ -698,8 +688,8 @@ React.DOM.input({
 
 type InputChangeEvent = React.ChangeEvent<HTMLInputElement>;
 type InputFormEvent = React.FormEvent<HTMLInputElement>;
-const changeEvent:InputChangeEvent = undefined as any;
-const formEvent:InputFormEvent = changeEvent;
+const changeEvent: InputChangeEvent = undefined as any;
+const formEvent: InputFormEvent = changeEvent;
 
 // defaultProps should be optional of props
 {
diff --git a/types/react/tslint.json b/types/react/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9dee232fbed76aaa6ec37f82d9cc04fe8db6b49d Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Wed, 28 Jun 2017 08:16:31 -0400
Subject: [PATCH 137/287] [jquery] Formatting.

---
 types/jquery/jquery-tests.ts | 102 ++++++++++++-----------------------
 1 file changed, 35 insertions(+), 67 deletions(-)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index b21aeb6427..efb87af785 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4467,8 +4467,7 @@ function JQueryStatic() {
                     c[0]; // $ExpectType boolean
                     c[1]; // $ExpectType SuccessTextStatus
                     c[2]; // $ExpectType jqXHR<boolean>
-                });
-                w.catch((a, b, c) => {
+                }, (a, b, c) => {
                     a[0]; // $ExpectType jqXHR<string>
                     a[1]; // $ExpectType ErrorTextStatus
                     a[2]; // $ExpectType string
@@ -4478,8 +4477,7 @@ function JQueryStatic() {
                     c[0]; // $ExpectType jqXHR<boolean>
                     c[1]; // $ExpectType ErrorTextStatus
                     c[2]; // $ExpectType string
-                });
-                w.then(null, null, (a, b, c) => {
+                }, (a, b, c) => {
                     a; // $ExpectType never
                     b; // $ExpectType never
                     c; // $ExpectType never
@@ -4497,16 +4495,14 @@ function JQueryStatic() {
                     b[0]; // $ExpectType number
                     b[1]; // $ExpectType SuccessTextStatus
                     b[2]; // $ExpectType jqXHR<number>
-                });
-                w.catch((a, b) => {
+                }, (a, b) => {
                     a[0]; // $ExpectType jqXHR<string>
                     a[1]; // $ExpectType ErrorTextStatus
                     a[2]; // $ExpectType string
                     b[0]; // $ExpectType jqXHR<number>
                     b[1]; // $ExpectType ErrorTextStatus
                     b[2]; // $ExpectType string
-                });
-                w.then(null, null, (a, b) => {
+                }, (a, b) => {
                     a; // $ExpectType never
                     b; // $ExpectType never
                 });
@@ -4516,23 +4512,15 @@ function JQueryStatic() {
             {
                 const w = $.when(t);
 
-                w.then((data, textStatus, jqXHR) => {
-                    // $ExpectType string
-                    data;
-                    // $ExpectType SuccessTextStatus
-                    textStatus;
-                    // $ExpectType jqXHR<string>
-                    jqXHR;
-                });
-                w.catch((jqXHR, textStatus, errorThrown) => {
-                    // $ExpectType jqXHR<string>
-                    jqXHR;
-                    // $ExpectType ErrorTextStatus
-                    textStatus;
-                    // $ExpectType string
-                    errorThrown;
-                });
-                w.then(null, null, (a, b, c) => {
+                w.then((a, b, c) => {
+                    a; // $ExpectType string
+                    b; // $ExpectType SuccessTextStatus
+                    c; // $ExpectType jqXHR<string>
+                }, (a, b, c) => {
+                    a; // $ExpectType jqXHR<string>
+                    b; // $ExpectType ErrorTextStatus
+                    c; // $ExpectType string
+                }, (a, b, c) => {
                     a; // $ExpectType never
                     b; // $ExpectType never
                     c; // $ExpectType never
@@ -4556,16 +4544,14 @@ function JQueryStatic() {
                     b[1]; // $ExpectType boolean
                     c[0]; // $ExpectType string
                     c[1]; // $ExpectType boolean
-                });
-                w.catch((a, b, c) => {
+                }, (a, b, c) => {
                     a[0]; // $ExpectType Error
                     a[1]; // $ExpectType any
                     b[0]; // $ExpectType Error
                     b[1]; // $ExpectType any
                     c[0]; // $ExpectType Error
                     c[1]; // $ExpectType any
-                });
-                w.then(null, null, (a, b, c) => {
+                }, (a, b, c) => {
                     a; // $ExpectType never
                     b; // $ExpectType never
                     c; // $ExpectType never
@@ -4581,14 +4567,12 @@ function JQueryStatic() {
                     a[1]; // $ExpectType boolean
                     b[0]; // $ExpectType string
                     b[1]; // $ExpectType boolean
-                });
-                w.catch((a, b) => {
+                }, (a, b) => {
                     a[0]; // $ExpectType Error
                     a[1]; // $ExpectType any
                     b[0]; // $ExpectType Error
                     b[1]; // $ExpectType any
-                });
-                w.then(null, null, (a, b) => {
+                }, (a, b) => {
                     a; // $ExpectType never
                     b; // $ExpectType never
                 });
@@ -4601,12 +4585,10 @@ function JQueryStatic() {
                 w.then((a, b) => {
                     a; // $ExpectType string
                     b; // $ExpectType boolean
-                });
-                w.catch((a, b) => {
+                }, (a, b) => {
                     a; // $ExpectType Error
                     b; // $ExpectType any
-                });
-                w.then(null, null, (a, b) => {
+                }, (a, b) => {
                     a; // $ExpectType never
                     b; // $ExpectType never
                 });
@@ -4616,54 +4598,40 @@ function JQueryStatic() {
         function Promise() {
             const w = $.when($.Deferred<string, Error, number>());
 
-            w.then(value => {
-                // $ExpectType string
-                value;
-            });
-            w.catch(reason => {
-                // $ExpectType Error
-                reason;
-            });
-            w.then(null, null, value => {
-                // $ExpectType never
-                value;
+            w.then(a => {
+                a; // $ExpectType string
+            }, a => {
+                a; // $ExpectType Error
+            }, a => {
+                a; // $ExpectType never
             });
         }
 
         function Thenable() {
             const w = $.when($.Deferred<string>());
 
-            w.then(value => {
-                // $ExpectType string
-                value;
+            w.then(a => {
+                a; // $ExpectType string
             });
         }
 
         function value() {
             const w = $.when('myVal1');
 
-            w.then(value => {
-                // $ExpectType string
-                value;
+            w.then(a => {
+                a; // $ExpectType string
             });
         }
 
         function Zero() {
             const w = $.when();
 
-            w.then((value) => {
-                // $ExpectType never
-                value;
-            });
-
-            w.catch((reason) => {
-                // $ExpectType never
-                reason;
-            });
-
-            w.then(null, null, (value) => {
-                // $ExpectType never
-                value;
+            w.then(a => {
+                a; // $ExpectType never
+            }, a => {
+                a; // $ExpectType never
+            }, a => {
+                a; // $ExpectType never
             });
         }
 

From 1b5e242876792f750dbe6af33fcae9eb107d91df Mon Sep 17 00:00:00 2001
From: kimu_shu <alfvegardrisc@gmail.com>
Date: Wed, 28 Jun 2017 21:55:08 +0900
Subject: [PATCH 138/287] Add overloads for writeFile, appendFile and
 appendFileSync

---
 types/node/index.d.ts       | 3 +++
 types/node/node-tests.ts    | 9 +++++++++
 types/node/v0/node-tests.ts | 3 +++
 types/node/v4/index.d.ts    | 3 +++
 types/node/v4/node-tests.ts | 9 +++++++++
 types/node/v6/index.d.ts    | 3 +++
 types/node/v6/node-tests.ts | 9 +++++++++
 types/node/v7/index.d.ts    | 3 +++
 types/node/v7/node-tests.ts | 9 +++++++++
 9 files changed, 51 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 9e69aca71e..acf69fefd9 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2833,14 +2833,17 @@ declare module "fs" {
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function appendFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFileSync(filename: string, data: any, encoding: string): void;
     export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
     export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 0297bc375b..d99b4b8030 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -170,10 +170,19 @@ namespace fs_tests {
             },
             assert.ifError);
 
+        fs.writeFile("testfile", "content", "utf8", assert.ifError);
+
         fs.writeFileSync("testfile", "content", "utf8");
         fs.writeFileSync("testfile", "content", { encoding: "utf8" });
     }
 
+    {
+        fs.appendFile("testfile", "foobar", "utf8", assert.ifError);
+        fs.appendFile("testfile", "foobar", { encoding: "utf8" }, assert.ifError);
+        fs.appendFileSync("testfile", "foobar", "utf8");
+        fs.appendFileSync("testfile", "foobar", { encoding: "utf8" });
+    }
+
     {
         var content: string;
         var buffer: Buffer;
diff --git a/types/node/v0/node-tests.ts b/types/node/v0/node-tests.ts
index 8bb4ac371d..57019bfe86 100644
--- a/types/node/v0/node-tests.ts
+++ b/types/node/v0/node-tests.ts
@@ -49,6 +49,9 @@ fs.writeFile("Harry Potter",
 
 fs.writeFileSync("testfile", "content", { encoding: "utf8" });
 
+fs.appendFile("testfile", "foobar", { encoding: "utf8" }, assert.ifError);
+fs.appendFileSync("testfile", "foobar", { encoding: "utf8" });
+
 var content: string,
     buffer: Buffer;
 
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 30b40dc2f0..14e0a58d1a 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -1773,14 +1773,17 @@ declare module "fs" {
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function appendFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFileSync(filename: string, data: any, encoding: string): void;
     export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
     export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index 247f6969ea..a3e1cca18a 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -152,10 +152,19 @@ namespace fs_tests {
             },
             assert.ifError);
 
+        fs.writeFile("testfile", "content", "utf8", assert.ifError);
+
         fs.writeFileSync("testfile", "content", "utf8");
         fs.writeFileSync("testfile", "content", { encoding: "utf8" });
     }
 
+    {
+        fs.appendFile("testfile", "foobar", "utf8", assert.ifError);
+        fs.appendFile("testfile", "foobar", { encoding: "utf8" }, assert.ifError);
+        fs.appendFileSync("testfile", "foobar", "utf8");
+        fs.appendFileSync("testfile", "foobar", { encoding: "utf8" });
+    }
+
     {
         var content: string;
         var buffer: Buffer;
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 21c363e95a..f1e7cc8fdb 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -2562,14 +2562,17 @@ declare module "fs" {
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function appendFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFileSync(filename: string, data: any, encoding: string): void;
     export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
     export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 057e0858e7..191f1128c2 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -169,10 +169,19 @@ namespace fs_tests {
             },
             assert.ifError);
 
+        fs.writeFile("testfile", "content", "utf8", assert.ifError);
+
         fs.writeFileSync("testfile", "content", "utf8");
         fs.writeFileSync("testfile", "content", { encoding: "utf8" });
     }
 
+    {
+        fs.appendFile("testfile", "foobar", "utf8", assert.ifError);
+        fs.appendFile("testfile", "foobar", { encoding: "utf8" }, assert.ifError);
+        fs.appendFileSync("testfile", "foobar", "utf8");
+        fs.appendFileSync("testfile", "foobar", { encoding: "utf8" });
+    }
+
     {
         var content: string;
         var buffer: Buffer;
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index b9763c08fc..34a05d33f3 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -2691,14 +2691,17 @@ declare module "fs" {
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
+    export function appendFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFileSync(filename: string, data: any, encoding: string): void;
     export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
     export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void;
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index 67b6d9f26f..4a2f53ab67 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -170,10 +170,19 @@ namespace fs_tests {
             },
             assert.ifError);
 
+        fs.writeFile("testfile", "content", "utf8", assert.ifError);
+
         fs.writeFileSync("testfile", "content", "utf8");
         fs.writeFileSync("testfile", "content", { encoding: "utf8" });
     }
 
+    {
+        fs.appendFile("testfile", "foobar", "utf8", assert.ifError);
+        fs.appendFile("testfile", "foobar", { encoding: "utf8" }, assert.ifError);
+        fs.appendFileSync("testfile", "foobar", "utf8");
+        fs.appendFileSync("testfile", "foobar", { encoding: "utf8" });
+    }
+
     {
         var content: string;
         var buffer: Buffer;

From 306806e1213c618c9796cadba789632f23202d62 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Wed, 28 Jun 2017 09:01:38 -0400
Subject: [PATCH 139/287] [jquery] More tests.

---
 types/jquery/jquery-tests.ts | 140 ++++++++++++++++++++++++++++-------
 1 file changed, 114 insertions(+), 26 deletions(-)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index efb87af785..3e93fc84b8 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4448,6 +4448,16 @@ function JQueryStatic() {
     }
 
     function when() {
+        interface I1 { kind: 'I1'; }
+        interface I2 { kind: 'I2'; }
+        interface I3 { kind: 'I3'; }
+        interface I4 { kind: 'I4'; }
+        interface I5 { kind: 'I5'; }
+        interface I6 { kind: 'I6'; }
+        interface I7 { kind: 'I7'; }
+        interface I8 { kind: 'I8'; }
+        interface I9 { kind: 'I9'; }
+
         function Promise3() {
             const t = $.ajax() as JQuery.jqXHR<string>;
             const u = $.ajax() as JQuery.jqXHR<number>;
@@ -4596,23 +4606,111 @@ function JQueryStatic() {
         }
 
         function Promise() {
-            const w = $.when($.Deferred<string, Error, number>());
+            const p1: JQuery.Promise<I1, I2, I3> = {} as any;
+            const p2: JQuery.Promise<I2, I3, I4> = {} as any;
+            const p3: JQuery.Promise<I3, I4, I5> = {} as any;
 
-            w.then(a => {
-                a; // $ExpectType string
-            }, a => {
-                a; // $ExpectType Error
-            }, a => {
-                a; // $ExpectType never
-            });
+            // 3 parameters
+            {
+                const w = $.when(p1, p2, p3);
+
+                w.then((a, b, c) => {
+                    a; // $ExpectType I1
+                    b; // $ExpectType I2
+                    c; // $ExpectType I3
+                }, (a, b, c) => {
+                    a; // $ExpectType I2
+                    b; // $ExpectType I3
+                    c; // $ExpectType I4
+                }, (a, b, c) => {
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
+                });
+            }
+
+            // 2 parameters
+            {
+                const w = $.when(p1, p2);
+
+                w.then((a, b) => {
+                    a; // $ExpectType I1
+                    b; // $ExpectType I2
+                }, (a, b) => {
+                    a; // $ExpectType I2
+                    b; // $ExpectType I3
+                }, (a, b) => {
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                });
+            }
+
+            // 1 parameter
+            {
+                const w = $.when(p1);
+
+                w.then(a => {
+                    a; // $ExpectType I1
+                }, a => {
+                    a; // $ExpectType I2
+                }, a => {
+                    a; // $ExpectType never
+                });
+            }
         }
 
         function Thenable() {
-            const w = $.when($.Deferred<string>());
+            const t1: JQuery.Thenable<I1> = {} as any;
+            const t2: JQuery.Thenable<I2> = {} as any;
+            const t3: JQuery.Thenable<I3> = {} as any;
 
-            w.then(a => {
-                a; // $ExpectType string
-            });
+            // 3 parameters
+            {
+                const w = $.when(t1, t2, t3);
+
+                w.then((a, b, c) => {
+                    a; // $ExpectType I1
+                    b; // $ExpectType I2
+                    c; // $ExpectType I3
+                }, (a, b, c) => {
+                    a; // $ExpectType any
+                    b; // $ExpectType any
+                    c; // $ExpectType any
+                }, (a, b, c) => {
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                    c; // $ExpectType never
+                });
+            }
+
+            // 2 parameters
+            {
+                const w = $.when(t1, t2);
+
+                w.then((a, b) => {
+                    a; // $ExpectType I1
+                    b; // $ExpectType I2
+                }, (a, b) => {
+                    a; // $ExpectType any
+                    b; // $ExpectType any
+                }, (a, b) => {
+                    a; // $ExpectType never
+                    b; // $ExpectType never
+                });
+            }
+
+            // 1 parameter
+            {
+                const w = $.when(t1);
+
+                w.then(a => {
+                    a; // $ExpectType I1
+                }, a => {
+                    a; // $ExpectType any
+                }, a => {
+                    a; // $ExpectType never
+                });
+            }
         }
 
         function value() {
@@ -4657,22 +4755,12 @@ function JQueryStatic() {
 
             class AsyncRunner {
                 Run(): void {
-                    const task1 = this.runTask1();
-                    const task2 = this.runTask2();
-                    const task3 = this.runTask3();
-
-                    task1.then(value => {
-                        value; // $ExpectType One
-                    });
-                    task2.then(value => {
-                        value; // $ExpectType Two
-                    });
-                    task3.then(value => {
-                        value; // $ExpectType Three
-                    });
+                    const task1: JQuery.Promise<One, any, any> = {} as any;
+                    const task2: JQuery.Promise<Two, any, any> = this.runTask2();
+                    const task3: JQuery.Promise<Three, any, any> = this.runTask3();
 
                     $.when(task1, task2, task3)
-                        .done((r1, r2, r3) => {
+                        .then((r1, r2, r3) => {
                             r1; // $ExpectType One
                             r2; // $ExpectType Two
                             r3; // $ExpectType Three

From ff3da11908f963a9a3c8463f755115577b1b5468 Mon Sep 17 00:00:00 2001
From: kimu_shu <alfvegardrisc@gmail.com>
Date: Wed, 28 Jun 2017 23:02:55 +0900
Subject: [PATCH 140/287] Make callback parameter mandatory

---
 types/node/index.d.ts    | 4 ++--
 types/node/v4/index.d.ts | 4 ++--
 types/node/v6/index.d.ts | 4 ++--
 types/node/v7/index.d.ts | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index acf69fefd9..1946277010 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2833,13 +2833,13 @@ declare module "fs" {
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-    export function appendFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 14e0a58d1a..a79f49e35d 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -1773,13 +1773,13 @@ declare module "fs" {
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-    export function appendFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index f1e7cc8fdb..b71a70e537 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -2562,13 +2562,13 @@ declare module "fs" {
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-    export function appendFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 34a05d33f3..f075587a95 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -2691,13 +2691,13 @@ declare module "fs" {
      */
     export function readFileSync(filename: string, options?: { flag?: string; }): Buffer;
     export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;
-    export function writeFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function writeFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function writeFileSync(filename: string, data: any, encoding: string): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void;
     export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void;
-    export function appendFile(filename: string, data: any, encoding: string, callback?: (err: NodeJS.ErrnoException) => void): void;
+    export function appendFile(filename: string, data: any, encoding: string, callback: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void;
     export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void;

From 9bda5e1be0e15f988ccd28ded41212a23f78f9b2 Mon Sep 17 00:00:00 2001
From: Joscha Feth <joscha@feth.com>
Date: Wed, 28 Jun 2017 16:09:12 +0200
Subject: [PATCH 141/287] add 'enzyme-to-json'

---
 types/enzyme-to-json/enzyme-to-json-tests.tsx |  6 +++++
 types/enzyme-to-json/index.d.ts               |  9 +++++++
 types/enzyme-to-json/tsconfig.json            | 24 +++++++++++++++++++
 types/enzyme-to-json/tslint.json              |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 types/enzyme-to-json/enzyme-to-json-tests.tsx
 create mode 100644 types/enzyme-to-json/index.d.ts
 create mode 100644 types/enzyme-to-json/tsconfig.json
 create mode 100644 types/enzyme-to-json/tslint.json

diff --git a/types/enzyme-to-json/enzyme-to-json-tests.tsx b/types/enzyme-to-json/enzyme-to-json-tests.tsx
new file mode 100644
index 0000000000..13827a3cdb
--- /dev/null
+++ b/types/enzyme-to-json/enzyme-to-json-tests.tsx
@@ -0,0 +1,6 @@
+import * as React from 'react';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+
+const wrapper = shallow(<strong>Hello World!</strong>);
+const result: object = toJson(wrapper);
diff --git a/types/enzyme-to-json/index.d.ts b/types/enzyme-to-json/index.d.ts
new file mode 100644
index 0000000000..cba4561649
--- /dev/null
+++ b/types/enzyme-to-json/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for enzyme-to-json 1.5
+// Project: https://github.com/adriantoine/enzyme-to-json#readme
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ReactWrapper, ShallowWrapper } from 'enzyme';
+
+export default function toJson<P, S>(wrapper: ShallowWrapper<P, S> | ReactWrapper<P, S> | Cheerio): object;
diff --git a/types/enzyme-to-json/tsconfig.json b/types/enzyme-to-json/tsconfig.json
new file mode 100644
index 0000000000..257f8797e0
--- /dev/null
+++ b/types/enzyme-to-json/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "enzyme-to-json-tests.tsx"
+    ]
+}
diff --git a/types/enzyme-to-json/tslint.json b/types/enzyme-to-json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/enzyme-to-json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4a877d3484136ae8fa35b1a53bf192fccb5b45f0 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Mon, 26 Jun 2017 11:17:38 -0400
Subject: [PATCH 142/287] [sizzle] Add type definitions.

---
 types/sizzle/index.d.ts      | 63 ++++++++++++++++++++++++++++++++++++
 types/sizzle/sizzle-tests.ts | 54 +++++++++++++++++++++++++++++++
 types/sizzle/tsconfig.json   | 23 +++++++++++++
 types/sizzle/tslint.json     |  6 ++++
 4 files changed, 146 insertions(+)
 create mode 100644 types/sizzle/index.d.ts
 create mode 100644 types/sizzle/sizzle-tests.ts
 create mode 100644 types/sizzle/tsconfig.json
 create mode 100644 types/sizzle/tslint.json

diff --git a/types/sizzle/index.d.ts b/types/sizzle/index.d.ts
new file mode 100644
index 0000000000..bfe24791bf
--- /dev/null
+++ b/types/sizzle/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for sizzle 2.3
+// Project: https://sizzlejs.com
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace Sizzle;
+
+declare const Sizzle: SizzleStatic;
+export = Sizzle;
+
+interface SizzleStatic {
+    selectors: Sizzle.Selectors;
+    <TArrayLike extends ArrayLike<Element>>(selector: string, context: Element | Document | DocumentFragment, results: TArrayLike): TArrayLike;
+    (selector: string, context?: Element | Document | DocumentFragment): Element[];
+    // tslint:disable-next-line:ban-types
+    compile(selector: string): Function;
+    matchSelector(element: Element, selector: string): boolean;
+    matches(selector: string, elements: Element[]): Element[];
+}
+
+declare namespace Sizzle {
+    interface Selectors {
+        cacheLength: number;
+        match: { [name: string]: RegExp; };
+        find: { [name: string]: Selectors.FindFunction; };
+        preFilter: { [name: string]: Selectors.PreFilterFunction; };
+        filter: { [name: string]: Selectors.FilterFunction; };
+        attrHandle: { [name: string]: Selectors.AttrHandleFunction; };
+        pseudos: { [name: string]: Selectors.PseudoFunction; };
+        setFilters: { [name: string]: Selectors.SetFilterFunction; };
+        createPseudo(fn: Selectors.CreatePseudoFunction): Selectors.PseudoFunction;
+    }
+
+    namespace Selectors {
+        interface FindFunction {
+            (match: RegExpMatchArray, context: Element | Document, isXML: boolean): Element[] | void;
+        }
+
+        interface PreFilterFunction {
+            (match: RegExpMatchArray): string[];
+        }
+
+        interface FilterFunction {
+            (element: string, ...matches: string[]): boolean;
+        }
+
+        interface AttrHandleFunction {
+            (elem: any, casePreservedName: string, isXML: boolean): string;
+        }
+
+        interface PseudoFunction {
+            (elem: Element): boolean;
+        }
+
+        interface CreatePseudoFunction {
+            (...args: any[]): PseudoFunction;
+        }
+
+        interface SetFilterFunction {
+            (elements: Element[], argument: number, not: boolean): Element[];
+        }
+    }
+}
diff --git a/types/sizzle/sizzle-tests.ts b/types/sizzle/sizzle-tests.ts
new file mode 100644
index 0000000000..3c6d17dc64
--- /dev/null
+++ b/types/sizzle/sizzle-tests.ts
@@ -0,0 +1,54 @@
+/// <reference types="jquery" />
+
+function pseudos() {
+    const $test = jQuery(document);
+    Sizzle.selectors.pseudos['fixed'] = (elem) => {
+        // $test[0] = elem as HTMLElement;
+        return $test.css('position') === 'fixed';
+    };
+}
+
+function createPseudos_0() {
+    Sizzle.selectors.pseudos['not'] =
+        Sizzle.selectors.createPseudo((subSelector) => {
+            const matcher = Sizzle.compile(subSelector);
+            return (elem) => {
+                return !matcher(elem);
+            };
+        });
+}
+
+function createPseudos_1() {
+    // An implementation of a case-insensitive contains pseudo
+    // made for all versions of jQuery
+    (($) => {
+        function icontains(elem: HTMLElement, text: string) {
+            return (
+                    elem.textContent ||
+                    elem.innerText ||
+                    $(elem).text() ||
+                    ''
+                ).toLowerCase().indexOf((text || '').toLowerCase()) > -1;
+        }
+
+        // $.expr.pseudos.icontains = $.expr.createPseudo(function(text) {
+        //     return function(elem) {
+        //         return icontains(elem as HTMLElement, text);
+        //     };
+        // });
+    })(jQuery);
+}
+
+function setFilters_0() {
+    Sizzle.selectors.setFilters['first'] = (elements, argument, not) => {
+        // No argument for first
+        return not ? elements.slice(1) : [elements[0]];
+    };
+}
+
+function setFilters_1(oldPOS: RegExp) {
+    Sizzle.selectors.match['POS'] = new RegExp(oldPOS.source.replace('first', 'uno'), 'gi');
+    Sizzle.selectors.setFilters['uno'] = Sizzle.selectors.setFilters['first'];
+    delete Sizzle.selectors.setFilters['first'];
+    Sizzle('div:uno'); // ==> [ <div> ]
+}
diff --git a/types/sizzle/tsconfig.json b/types/sizzle/tsconfig.json
new file mode 100644
index 0000000000..aa10d374d5
--- /dev/null
+++ b/types/sizzle/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sizzle-tests.ts"
+    ]
+}
diff --git a/types/sizzle/tslint.json b/types/sizzle/tslint.json
new file mode 100644
index 0000000000..a4bcc87748
--- /dev/null
+++ b/types/sizzle/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "callable-types": false
+    }
+}

From 0d99852dfab367b2f4a3bbd639bbb627b7b0c29c Mon Sep 17 00:00:00 2001
From: cjackson234 <cjackson234@gmail.com>
Date: Wed, 28 Jun 2017 11:58:06 -0400
Subject: [PATCH 143/287] Update index.d.ts

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

diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index 37c57198c9..68e26ee048 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -7,7 +7,7 @@
 // missing:
 // - Static methods that are defined in JQueryStatic.fn are not typed.
 // - Plugin and extension definitions are not typed.
-// - Some return types are not fully wokring
+// - Some return types are not fully working
 
 /// <reference types="jquery" />
 

From eff196f9ae7a329e515c911136b4dcbd0c19b383 Mon Sep 17 00:00:00 2001
From: Damien Rajon <pyrhockz@gmail.com>
Date: Wed, 28 Jun 2017 18:27:30 +0200
Subject: [PATCH 144/287] Function is not a default export

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

diff --git a/types/async.nexttick/async.nexttick-tests.ts b/types/async.nexttick/async.nexttick-tests.ts
index 9d8acb33aa..90f6ae7f15 100644
--- a/types/async.nexttick/async.nexttick-tests.ts
+++ b/types/async.nexttick/async.nexttick-tests.ts
@@ -1,4 +1,4 @@
-import nextTick from 'async.nexttick';
+import {nextTick} from 'async.nexttick';
 
 function calledOnNextTick(a: string): number {
     return parseInt(a, 10);
diff --git a/types/async.nexttick/index.d.ts b/types/async.nexttick/index.d.ts
index 22efd68fc7..a8572cc087 100644
--- a/types/async.nexttick/index.d.ts
+++ b/types/async.nexttick/index.d.ts
@@ -3,4 +3,4 @@
 // Definitions by: Damien "pyrho" Rajon <https://github.com/pyrho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default function nextTick(callback: () => void, ...args: any[]): void;
+export function nextTick(callback: () => void, ...args: any[]): void;

From c0ec19e2d0fe3060b7dd490f74115a4e39840ba2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 28 Jun 2017 09:50:28 -0700
Subject: [PATCH 145/287] Fix underscore tests for TS 2.4

A test in underscore mistakenly used the truthiness of _.identity as a
predicate for _.every, even though the predicate is supposed to return
boolean. The new code wraps _.identity in an arrow and prefixes a `!!`
to coerce truthy values to true.
---
 types/underscore/underscore-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/underscore/underscore-tests.ts b/types/underscore/underscore-tests.ts
index 11dcf477a0..f72bb3ca68 100644
--- a/types/underscore/underscore-tests.ts
+++ b/types/underscore/underscore-tests.ts
@@ -156,7 +156,7 @@ _.where(listOfPlays, { author: "Shakespeare", year: 1611 });
 
 var odds = _.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 
-_.every([true, 1, null, 'yes'], _.identity);
+_.every([true, 1, null, 'yes'], x => !!_.identity(x));
 
 _.any([null, 0, 'yes', false]);
 

From a6134ee5a1e6db498f570e98bb77aeaf8fa02cbc Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Wed, 28 Jun 2017 13:28:42 -0400
Subject: [PATCH 146/287] [jquery] Remove support for multiple multi-argument
 Promises from when().

---
 types/jquery/index.d.ts      |  42 -------
 types/jquery/jquery-tests.ts | 205 +++++++++++++++++------------------
 2 files changed, 102 insertions(+), 145 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index ab44375843..834ee4c70d 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -3267,30 +3267,6 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @since 1.12-2.2
      */
     uniqueSort<T extends Element>(array: T[]): T[];
-    /**
-     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
-     * Deferred objects that represent asynchronous events.
-     *
-     * @see {@link https://api.jquery.com/jQuery.when/}
-     * @since 1.5
-     */
-    when<TR1, TJ1,
-        UR1, UJ1,
-        VR1, VJ1,
-        TR2, TJ2,
-        UR2, UJ2,
-        VR2, VJ2,
-        TR3 = never, TJ3 = never,
-        UR3 = never, UJ3 = never,
-        VR3 = never, VJ3 = never>
-        (deferredT: JQuery.Promise3<TR1, TJ1, any, TR2, TJ2, any, TR3, TJ3, any> |
-             JQuery.Promise2<TR1, TJ1, any, TR2, TJ2, any>,
-         deferredU: JQuery.Promise3<UR1, UJ1, any, UR2, UJ2, any, UR3, UJ3, any> |
-             JQuery.Promise2<UR1, UJ1, any, UR2, UJ2, any>,
-         deferredV: JQuery.Promise3<VR1, VJ1, any, VR2, VJ2, any, VR3, VJ3, any> |
-             JQuery.Promise2<VR1, VJ1, any, VR2, VJ2, any>): JQuery.Promise3<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], never,
-        [UR1, UR2, UR3], [UJ1, UJ2, UJ3], never,
-        [VR1, VR2, VR3], [VJ1, VJ2, VJ3], never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
@@ -3312,24 +3288,6 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @see {@link https://api.jquery.com/jQuery.when/}
      * @since 1.5
      */
-    when<TR1, TJ1,
-        UR1, UJ1,
-        TR2, TJ2,
-        UR2, UJ2,
-        TR3 = never, TJ3 = never,
-        UR3 = never, UJ3 = never>
-        (deferredT: JQuery.Promise3<TR1, TJ1, any, TR2, TJ2, any, TR3, TJ3, any> |
-             JQuery.Promise2<TR1, TJ1, any, TR2, TJ2, any>,
-         deferredU: JQuery.Promise3<UR1, UJ1, any, UR2, UJ2, any, UR3, UJ3, any> |
-             JQuery.Promise2<UR1, UJ1, any, UR2, UJ2, any>): JQuery.Promise2<[TR1, TR2, TR3], [TJ1, TJ2, TJ3], never,
-        [UR1, UR2, UR3], [UJ1, UJ2, UJ3], never>;
-    /**
-     * Provides a way to execute callback functions based on zero or more Thenable objects, usually
-     * Deferred objects that represent asynchronous events.
-     *
-     * @see {@link https://api.jquery.com/jQuery.when/}
-     * @since 1.5
-     */
     when<TR1, UR1,
         TJ1 = any, UJ1 = any>
         (deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1,
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 3e93fc84b8..325a288889 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -4463,60 +4463,60 @@ function JQueryStatic() {
             const u = $.ajax() as JQuery.jqXHR<number>;
             const v = $.ajax() as JQuery.jqXHR<boolean>;
 
-            // 3 parameters
-            {
-                const w = $.when(t, u, v);
-
-                w.then((a, b, c) => {
-                    a[0]; // $ExpectType string
-                    a[1]; // $ExpectType SuccessTextStatus
-                    a[2]; // $ExpectType jqXHR<string>
-                    b[0]; // $ExpectType number
-                    b[1]; // $ExpectType SuccessTextStatus
-                    b[2]; // $ExpectType jqXHR<number>
-                    c[0]; // $ExpectType boolean
-                    c[1]; // $ExpectType SuccessTextStatus
-                    c[2]; // $ExpectType jqXHR<boolean>
-                }, (a, b, c) => {
-                    a[0]; // $ExpectType jqXHR<string>
-                    a[1]; // $ExpectType ErrorTextStatus
-                    a[2]; // $ExpectType string
-                    b[0]; // $ExpectType jqXHR<number>
-                    b[1]; // $ExpectType ErrorTextStatus
-                    b[2]; // $ExpectType string
-                    c[0]; // $ExpectType jqXHR<boolean>
-                    c[1]; // $ExpectType ErrorTextStatus
-                    c[2]; // $ExpectType string
-                }, (a, b, c) => {
-                    a; // $ExpectType never
-                    b; // $ExpectType never
-                    c; // $ExpectType never
-                });
-            }
-
-            // 2 parameters
-            {
-                const w = $.when(t, u);
-
-                w.then((a, b) => {
-                    a[0]; // $ExpectType string
-                    a[1]; // $ExpectType SuccessTextStatus
-                    a[2]; // $ExpectType jqXHR<string>
-                    b[0]; // $ExpectType number
-                    b[1]; // $ExpectType SuccessTextStatus
-                    b[2]; // $ExpectType jqXHR<number>
-                }, (a, b) => {
-                    a[0]; // $ExpectType jqXHR<string>
-                    a[1]; // $ExpectType ErrorTextStatus
-                    a[2]; // $ExpectType string
-                    b[0]; // $ExpectType jqXHR<number>
-                    b[1]; // $ExpectType ErrorTextStatus
-                    b[2]; // $ExpectType string
-                }, (a, b) => {
-                    a; // $ExpectType never
-                    b; // $ExpectType never
-                });
-            }
+            // // 3 parameters
+            // {
+            //     const w = $.when(t, u, v);
+            //
+            //     w.then((a, b, c) => {
+            //         a[0]; // $ExpectType string
+            //         a[1]; // $ExpectType SuccessTextStatus
+            //         a[2]; // $ExpectType jqXHR<string>
+            //         b[0]; // $ExpectType number
+            //         b[1]; // $ExpectType SuccessTextStatus
+            //         b[2]; // $ExpectType jqXHR<number>
+            //         c[0]; // $ExpectType boolean
+            //         c[1]; // $ExpectType SuccessTextStatus
+            //         c[2]; // $ExpectType jqXHR<boolean>
+            //     }, (a, b, c) => {
+            //         a[0]; // $ExpectType jqXHR<string>
+            //         a[1]; // $ExpectType ErrorTextStatus
+            //         a[2]; // $ExpectType string
+            //         b[0]; // $ExpectType jqXHR<number>
+            //         b[1]; // $ExpectType ErrorTextStatus
+            //         b[2]; // $ExpectType string
+            //         c[0]; // $ExpectType jqXHR<boolean>
+            //         c[1]; // $ExpectType ErrorTextStatus
+            //         c[2]; // $ExpectType string
+            //     }, (a, b, c) => {
+            //         a; // $ExpectType never
+            //         b; // $ExpectType never
+            //         c; // $ExpectType never
+            //     });
+            // }
+            //
+            // // 2 parameters
+            // {
+            //     const w = $.when(t, u);
+            //
+            //     w.then((a, b) => {
+            //         a[0]; // $ExpectType string
+            //         a[1]; // $ExpectType SuccessTextStatus
+            //         a[2]; // $ExpectType jqXHR<string>
+            //         b[0]; // $ExpectType number
+            //         b[1]; // $ExpectType SuccessTextStatus
+            //         b[2]; // $ExpectType jqXHR<number>
+            //     }, (a, b) => {
+            //         a[0]; // $ExpectType jqXHR<string>
+            //         a[1]; // $ExpectType ErrorTextStatus
+            //         a[2]; // $ExpectType string
+            //         b[0]; // $ExpectType jqXHR<number>
+            //         b[1]; // $ExpectType ErrorTextStatus
+            //         b[2]; // $ExpectType string
+            //     }, (a, b) => {
+            //         a; // $ExpectType never
+            //         b; // $ExpectType never
+            //     });
+            // }
 
             // 1 parameter
             {
@@ -4543,50 +4543,50 @@ function JQueryStatic() {
             const u: JQuery.Promise2<string, Error, number, boolean, any, any> = {} as any;
             const v: JQuery.Promise2<string, Error, number, boolean, any, any> = {} as any;
 
-            // 3 parameters
-            {
-                const w = $.when(t, u, v);
-
-                w.then((a, b, c) => {
-                    a[0]; // $ExpectType string
-                    a[1]; // $ExpectType boolean
-                    b[0]; // $ExpectType string
-                    b[1]; // $ExpectType boolean
-                    c[0]; // $ExpectType string
-                    c[1]; // $ExpectType boolean
-                }, (a, b, c) => {
-                    a[0]; // $ExpectType Error
-                    a[1]; // $ExpectType any
-                    b[0]; // $ExpectType Error
-                    b[1]; // $ExpectType any
-                    c[0]; // $ExpectType Error
-                    c[1]; // $ExpectType any
-                }, (a, b, c) => {
-                    a; // $ExpectType never
-                    b; // $ExpectType never
-                    c; // $ExpectType never
-                });
-            }
-
-            // 2 parameters
-            {
-                const w = $.when(t, u);
-
-                w.then((a, b) => {
-                    a[0]; // $ExpectType string
-                    a[1]; // $ExpectType boolean
-                    b[0]; // $ExpectType string
-                    b[1]; // $ExpectType boolean
-                }, (a, b) => {
-                    a[0]; // $ExpectType Error
-                    a[1]; // $ExpectType any
-                    b[0]; // $ExpectType Error
-                    b[1]; // $ExpectType any
-                }, (a, b) => {
-                    a; // $ExpectType never
-                    b; // $ExpectType never
-                });
-            }
+            // // 3 parameters
+            // {
+            //     const w = $.when(t, u, v);
+            //
+            //     w.then((a, b, c) => {
+            //         a[0]; // $ExpectType string
+            //         a[1]; // $ExpectType boolean
+            //         b[0]; // $ExpectType string
+            //         b[1]; // $ExpectType boolean
+            //         c[0]; // $ExpectType string
+            //         c[1]; // $ExpectType boolean
+            //     }, (a, b, c) => {
+            //         a[0]; // $ExpectType Error
+            //         a[1]; // $ExpectType any
+            //         b[0]; // $ExpectType Error
+            //         b[1]; // $ExpectType any
+            //         c[0]; // $ExpectType Error
+            //         c[1]; // $ExpectType any
+            //     }, (a, b, c) => {
+            //         a; // $ExpectType never
+            //         b; // $ExpectType never
+            //         c; // $ExpectType never
+            //     });
+            // }
+            //
+            // // 2 parameters
+            // {
+            //     const w = $.when(t, u);
+            //
+            //     w.then((a, b) => {
+            //         a[0]; // $ExpectType string
+            //         a[1]; // $ExpectType boolean
+            //         b[0]; // $ExpectType string
+            //         b[1]; // $ExpectType boolean
+            //     }, (a, b) => {
+            //         a[0]; // $ExpectType Error
+            //         a[1]; // $ExpectType any
+            //         b[0]; // $ExpectType Error
+            //         b[1]; // $ExpectType any
+            //     }, (a, b) => {
+            //         a; // $ExpectType never
+            //         b; // $ExpectType never
+            //     });
+            // }
 
             // 1 parameter
             {
@@ -4742,8 +4742,7 @@ function JQueryStatic() {
             $.when().then(() => {
                 return first();
             }).then((value) => {
-                // $ExpectType string
-                value;
+                value; // $ExpectType string
             });
         }
 
@@ -4755,9 +4754,9 @@ function JQueryStatic() {
 
             class AsyncRunner {
                 Run(): void {
-                    const task1: JQuery.Promise<One, any, any> = {} as any;
-                    const task2: JQuery.Promise<Two, any, any> = this.runTask2();
-                    const task3: JQuery.Promise<Three, any, any> = this.runTask3();
+                    const task1 = this.runTask1();
+                    const task2 = this.runTask2();
+                    const task3 = this.runTask3();
 
                     $.when(task1, task2, task3)
                         .then((r1, r2, r3) => {

From ad15fab9181930b4a85cd19aa5bf91f210852065 Mon Sep 17 00:00:00 2001
From: amikhalev <alexmikhalevalex@gmail.com>
Date: Wed, 28 Jun 2017 11:29:53 -0600
Subject: [PATCH 147/287] Changed uses of any in yargs to object

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

diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index 02d4c6cb69..db8d48d14d 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -5,6 +5,7 @@
 //                 Jeffery Grajkowski <https://github.com/pushplay>
 //                 Jeff Kenney <https://github.com/jeffkenney>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // unified-signatures: Because there is useful information in the argument names of the overloaded signatures
 // prefer-method-signature: Because it makes more sense for optional functions provided in options objects
@@ -119,11 +120,11 @@ declare namespace yargs {
         choices(key: string, values: Choices): Argv;
 
         config(): Argv;
-        config(explicitConfigurationObject: any): Argv;
-        config(key: string, description?: string, parseFn?: (configPath: string) => any): Argv;
-        config(keys: string[], description?: string, parseFn?: (configPath: string) => any): Argv;
-        config(key: string, parseFn: (configPath: string) => any): Argv;
-        config(keys: string[], parseFn: (configPath: string) => any): Argv;
+        config(explicitConfigurationObject: object): Argv;
+        config(key: string, description?: string, parseFn?: (configPath: string) => object): Argv;
+        config(keys: string[], description?: string, parseFn?: (configPath: string) => object): Argv;
+        config(key: string, parseFn: (configPath: string) => object): Argv;
+        config(keys: string[], parseFn: (configPath: string) => object): Argv;
 
         conflicts(key: string, value: string): Argv;
         conflicts(conflicts: { [key: string]: string }): Argv;
@@ -207,7 +208,7 @@ declare namespace yargs {
         choices?: Choices;
         coerce?: (arg: any) => any;
         config?: boolean;
-        configParser?: (configPath: string) => any;
+        configParser?: (configPath: string) => object;
         count?: boolean;
         default?: any;
         defaultDescription?: string;
diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index 8a0120f80d..2847242fd4 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -561,7 +561,7 @@ function Argv$commandObject() {
                 choices: ["a", "b", "c"],
                 coerce: f => JSON.stringify(f),
                 config: true,
-                configParser: t => t,
+                configParser: t => JSON.parse(fs.readFileSync(t, "utf8")),
                 count: true,
                 default: "myvalue",
                 defaultDescription: "description",

From c98d7e4b4d552f99dddb7c589098857233b03f79 Mon Sep 17 00:00:00 2001
From: amikhalev <alexmikhalevalex@gmail.com>
Date: Wed, 28 Jun 2017 13:47:21 -0600
Subject: [PATCH 148/287] Added missing options keys + tests

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

diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index db8d48d14d..0bcfcedc74 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -209,6 +209,7 @@ declare namespace yargs {
         coerce?: (arg: any) => any;
         config?: boolean;
         configParser?: (configPath: string) => object;
+        conflicts?: string | object;
         count?: boolean;
         default?: any;
         defaultDescription?: string;
@@ -220,6 +221,7 @@ declare namespace yargs {
         description?: string;
         global?: boolean;
         group?: string;
+        implies?: string | object;
         nargs?: number;
         normalize?: boolean;
         number?: boolean;
diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index 2847242fd4..1be6554909 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -130,7 +130,9 @@ function Argv$options() {
             normalize: true,
             global: false,
             array: true,
-            nargs: 3
+            nargs: 3,
+            implies: 'other-arg',
+            conflicts: 'conflicting-arg',
         })
         .argv
         ;

From 6535a2d11e755e0dfb1286a9e0b70325a39c5fb3 Mon Sep 17 00:00:00 2001
From: amikhalev <alexmikhalevalex@gmail.com>
Date: Wed, 28 Jun 2017 13:48:13 -0600
Subject: [PATCH 149/287] Added Arguments interface type, fixed various method
 types

---
 types/yargs/index.d.ts     | 31 +++++++++++++++++++++----------
 types/yargs/yargs-tests.ts |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index 0bcfcedc74..eb32be1bb2 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -13,9 +13,9 @@
 
 declare namespace yargs {
     interface Argv {
-        argv: any;
-        (...args: any[]): any;
-        parse(...args: any[]): any;
+        argv: Arguments;
+        (args?: string[], cwd?: string): Arguments;
+        parse(args: string | string[], context?: object, parseCallback?: ParseCallback): Arguments;
 
         reset(): Argv;
 
@@ -26,9 +26,9 @@ declare namespace yargs {
 
         terminalWidth(): number;
 
-        alias(shortName: string, longName: string): Argv;
-        alias(aliases: { [shortName: string]: string }): Argv;
-        alias(aliases: { [shortName: string]: string[] }): Argv;
+        alias(shortName: string, longName: string | string[]): Argv;
+        alias(shortNames: string[], longName: string): Argv;
+        alias(aliases: { [shortName: string]: string | string[] }): Argv;
 
         array(key: string): Argv;
         array(keys: string[]): Argv;
@@ -76,7 +76,7 @@ declare namespace yargs {
         requiresArg(key: string): Argv;
         requiresArg(keys: string[]): Argv;
 
-        describe(key: string, description: string): Argv;
+        describe(key: string | string[], description: string): Argv;
         describe(descriptions: { [key: string]: string }): Argv;
 
         option(key: string, options: Options): Argv;
@@ -90,8 +90,8 @@ declare namespace yargs {
         command(command: string, description: string): Argv;
         command(command: string, description: string, builder: (args: Argv) => Argv): Argv;
         command(command: string, description: string, builder: { [optionName: string]: Options }): Argv;
-        command(command: string, description: string, builder: { [optionName: string]: Options }, handler: (args: any) => void): Argv;
-        command(command: string, description: string, builder: (args: Argv) => Argv, handler: (args: any) => void): Argv;
+        command(command: string, description: string, builder: { [optionName: string]: Options }, handler: (args: Arguments) => void): Argv;
+        command(command: string, description: string, builder: (args: Argv) => Argv, handler: (args: Arguments) => void): Argv;
         command(command: string, description: string, module: CommandModule): Argv;
         command(module: CommandModule): Argv;
 
@@ -105,7 +105,7 @@ declare namespace yargs {
 
         example(command: string, description: string): Argv;
 
-        check(func: (argv: any, aliases: { [alias: string]: string }) => any): Argv;
+        check(func: (argv: Arguments, aliases: { [alias: string]: string }) => any): Argv;
 
         boolean(key: string): Argv;
         boolean(keys: string[]): Argv;
@@ -193,6 +193,16 @@ declare namespace yargs {
         updateStrings(obj: { [key: string]: string }): Argv;
     }
 
+    interface Arguments {
+        /** Non-option arguments */
+        _: string[];
+        /** The script name or node command */
+        $0: string;
+
+        /** All remaining options */
+        [ argName: string ]: any;
+    }
+
     interface RequireDirectoryOptions {
         recurse?: boolean;
         extensions?: string[];
@@ -241,6 +251,7 @@ declare namespace yargs {
         handler: (args: any) => void;
     }
 
+    type ParseCallback = (err: Error | undefined, argv: Arguments, output: string) => void;
     type CommandBuilder = { [key: string]: Options } | ((args: Argv) => Argv);
     type SyncCompletionFunction = (current: string, argv: any) => string[];
     type AsyncCompletionFunction = (current: string, argv: any, done: (completion: string[]) => void) => void;
diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index 1be6554909..344744dc38 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -253,7 +253,7 @@ function command() {
                 describe: 'the URL to make an HTTP request to'
             });
         },
-        (argv: { url: string }) => {
+        (argv) => {
             console.dir(argv.url);
         }
         )

From 2185ee769f71dcf04b6a0202c69ffacdacd22b19 Mon Sep 17 00:00:00 2001
From: amikhalev <alexmikhalevalex@gmail.com>
Date: Wed, 28 Jun 2017 13:51:04 -0600
Subject: [PATCH 150/287] Added argv tests for yargs

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

diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index 344744dc38..44e62d66dd 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -113,6 +113,12 @@ function line_count() {
 // Below are tests for individual methods.
 // Not all methods are covered yet, and neither are all possible invocations of methods.
 
+function Argv$argv() {
+    let argv = yargs.argv;
+    console.log("command name: " + argv.$0);
+    console.log("command: " + argv._[1]);
+}
+
 function Argv_parsing() {
     let argv1 = yargs.argv;
     let argv2 = yargs(['-x', '1', '-y', '2']).argv;

From b9aac3eaa1a39f2c983d4f578261dcc98b51aac3 Mon Sep 17 00:00:00 2001
From: amikhalev <alexmikhalevalex@gmail.com>
Date: Wed, 28 Jun 2017 13:51:17 -0600
Subject: [PATCH 151/287] Yargs only require version 2.2

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

diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index eb32be1bb2..faf26b3fa8 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -5,7 +5,7 @@
 //                 Jeffery Grajkowski <https://github.com/pushplay>
 //                 Jeff Kenney <https://github.com/jeffkenney>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.2
 
 // unified-signatures: Because there is useful information in the argument names of the overloaded signatures
 // prefer-method-signature: Because it makes more sense for optional functions provided in options objects

From 1f921205c92c22df38d446c97a092964eb0aedef Mon Sep 17 00:00:00 2001
From: amikhalev <alexmikhalevalex@gmail.com>
Date: Wed, 28 Jun 2017 13:51:53 -0600
Subject: [PATCH 152/287] Added test for choices parameter

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

diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index 44e62d66dd..2c0756d427 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -566,7 +566,7 @@ function Argv$commandObject() {
                 alias: "string",
                 array: true,
                 boolean: true,
-                choices: ["a", "b", "c"],
+                choices: [undefined, false, "a", "b", "c"],
                 coerce: f => JSON.stringify(f),
                 config: true,
                 configParser: t => JSON.parse(fs.readFileSync(t, "utf8")),

From d872ea26eee2b57d93610553f4cf246a152edc37 Mon Sep 17 00:00:00 2001
From: Flarna <deb2001-github@yahoo.de>
Date: Wed, 28 Jun 2017 22:21:57 +0200
Subject: [PATCH 153/287] object => Object to keep compat with TS <2.3

---
 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 2399eb2a0d..8eccbde35b 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -4528,7 +4528,7 @@ declare module "async_hooks" {
          * @param triggerId the unique ID of the async resource in whose execution context this async resource was created
          * @param resource reference to the resource representing the async operation, needs to be released during destroy
          */
-        init?(asyncId: number, type: string, triggerId: number, resource: object): void;
+        init?(asyncId: number, type: string, triggerId: number, resource: Object): void;
         /**
          * When an asynchronous operation is initiated or completes a callback is called to notify the user.
          * The before callback is called just before said callback is executed.

From b4991d164d2e6c8dc2c88f81c858492adbe6bba9 Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Tue, 27 Jun 2017 00:38:29 +0300
Subject: [PATCH 154/287] Action is nothing but object with `type`

---
 types/cote/cote-tests.ts | 39 ++++++++++++++++++++++++++++++++-------
 types/cote/index.d.ts    | 22 +++++++++-------------
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index 3236fe83b7..25a6e819d9 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -34,7 +34,12 @@ class Readme {
             respondsTo: ['randomRequest']
         });
 
-        randomResponder.on('randomRequest', (req: cote.Action<{ val: number }>) => {
+        interface RandomRequest {
+            type: 'randomRequest';
+            payload: { val: number };
+        }
+
+        randomResponder.on('randomRequest', (req: RandomRequest) => {
             const answer = Math.floor(Math.random() * 10);
             console.log('request', req.payload.val, 'answering with', answer);
             return Promise.resolve(answer);
@@ -46,7 +51,12 @@ class Readme {
 
         const userResponder = new cote.Responder({ name: 'User Responder' });
 
-        userResponder.on('find', (req: cote.Action<{ username: string }>) => UserModel.findOne(req.payload));
+        interface Find {
+            type: 'find';
+            payload: { username: string };
+        }
+
+        userResponder.on('find', (req: Find) => UserModel.findOne(req.payload));
     }
 
     mongooseRequester() {
@@ -157,11 +167,16 @@ class Readme {
             eur_usd: 1.10
         };
 
-        responder.on('convert', (req: cote.Action<{
-            amount: number,
-            from: string,
-            to: string
-        }>) => {
+        interface Convert {
+            type: 'convert';
+            payload: {
+                amount: number,
+                from: string,
+                to: string
+            };
+        }
+
+        responder.on('convert', (req: Convert) => {
             const { payload } = req;
             return Promise.resolve(payload.amount * rates[`${payload.from}_${payload.to}`]);
         });
@@ -183,3 +198,13 @@ class Readme {
         const req = new cote.Requester({ name: 'req' }, { broadcast: '255.255.255.255' });
     }
 }
+
+/**
+ * Fixes for initial errors and shortcomings.
+ * @see https://github.com/makepost/DefinitelyTyped/projects/1
+ */
+class InitialObservations {
+    action() {
+        const action: cote.Action = { type: 'someAction' };
+    }
+}
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index 6a59b37392..950d938740 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -26,7 +26,7 @@ export class Requester {
      *
      * @param action Request.
      */
-    send<T>(action: Action<T>): Promise<any>;
+    send<T extends Action>(action: T): Promise<any>;
 }
 
 export class Responder {
@@ -48,9 +48,9 @@ export class Responder {
      * @param type Type. May be wildcarded or namespaced like in EventEmitter2.
      * @param listener Callback. Should return a result.
      */
-    on<T>(
+    on<T extends Action>(
         type: string,
-        listener: (action: Action<T>) => Promise<any>
+        listener: (action: T) => Promise<any>
     ): void;
 }
 
@@ -74,9 +74,9 @@ export class Publisher {
      * @param type EventEmitter-compatible type.
      * @param action Request.
      */
-    publish<T>(
+    publish<T extends Action>(
         type: string,
-        action: Action<T>
+        action: T
     ): void;
 }
 
@@ -99,9 +99,9 @@ export class Subscriber {
      * @param type Type. May be wildcarded or namespaced like in EventEmitter2.
      * @param listener Callback. Returns nothing.
      */
-    on<T>(
+    on<T extends Action>(
         type: string,
-        listener: (action: Action<T>) => void
+        listener: (action: T) => void
     ): void;
 }
 
@@ -151,14 +151,10 @@ export function MonitoringTool(port: number): {
 };
 
 /**
- * Flux standard action.
- * @see https://github.com/acdlite/flux-standard-action
+ * Action is nothing but object with `type`.
  */
-export interface Action<T> {
+export interface Action {
     type: string;
-    payload: T;
-    error?: boolean;
-    meta?: {};
 }
 
 /**

From 342c42ca6a0042c88d5671345a8961eeea3f9bb1 Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Tue, 27 Jun 2017 01:43:03 +0300
Subject: [PATCH 155/287] Inherit from EventEmitter2 and expose its API

---
 types/cote/cote-tests.ts | 39 +++++++++++++++++++++++++++++++++++++++
 types/cote/index.d.ts    | 21 +++++++++++----------
 types/cote/package.json  |  5 +++++
 3 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 types/cote/package.json

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index 25a6e819d9..eb2bfbf38b 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -207,4 +207,43 @@ class InitialObservations {
     action() {
         const action: cote.Action = { type: 'someAction' };
     }
+
+    eventEmitter() {
+        const quitter = new cote.Requester({ name: 'Quitter' });
+        quitter.onAny(() => process.exit);
+
+        const indecisive = new cote.Responder({ name: 'Indecisive' });
+        const callback = <T> (x: T) => Promise.resolve(x);
+        indecisive.on('choice', callback);
+        indecisive.off('choice', callback);
+
+        const techno = new cote.Publisher({ name: 'Techno' });
+        techno.removeAllListeners();
+
+        const village = new cote.Subscriber({ name: 'Village' });
+        const doHelp = () => { };
+        village.many('wolf', 2, doHelp);
+        village.emit('wolf');
+        village.emit('wolf');
+        const emptyArray = village.listenersAny();
+        village.emit('wolf'); // no reaction
+
+        const eternity = new cote.Sockend(null as any, { name: 'Eternity' });
+        const handler = () => {
+            if (Math.random() === Number.MIN_VALUE) {
+                console.log('It happened.');
+                eternity.offAny(handler);
+            }
+        };
+        eternity.addListener('request', handler);
+
+        const monitor = new cote.Monitor({ name: 'Monitor' });
+        monitor.setMaxListeners(1);
+        monitor.once('foobar', () => {
+            monitor.removeAllListeners();
+            monitor.once('foobar', () => {
+                console.log('Not a warning.');
+            });
+        });
+    }
 }
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index 950d938740..ff1f115e5b 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -3,11 +3,12 @@
 // Definitions by: makepost <https://github.com/makepost>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import { EventEmitter2 } from "./node_modules/eventemitter2";
 import * as SocketIO from "socket.io";
 import { Stream } from "stream";
 import { Server } from "http";
 
-export class Requester {
+export class Requester extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -29,7 +30,7 @@ export class Requester {
     send<T extends Action>(action: T): Promise<any>;
 }
 
-export class Responder {
+export class Responder extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -49,12 +50,12 @@ export class Responder {
      * @param listener Callback. Should return a result.
      */
     on<T extends Action>(
-        type: string,
+        type: string | string[],
         listener: (action: T) => Promise<any>
-    ): void;
+    ): this;
 }
 
-export class Publisher {
+export class Publisher extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -80,7 +81,7 @@ export class Publisher {
     ): void;
 }
 
-export class Subscriber {
+export class Subscriber extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -100,12 +101,12 @@ export class Subscriber {
      * @param listener Callback. Returns nothing.
      */
     on<T extends Action>(
-        type: string,
+        type: string | string[],
         listener: (action: T) => void
-    ): void;
+    ): this;
 }
 
-export class Sockend {
+export class Sockend extends EventEmitter2 {
     /**
      * Exposes APIs directly to front-end. Make sure to use namespaces.
      */
@@ -124,7 +125,7 @@ export class Sockend {
     );
 }
 
-export class Monitor {
+export class Monitor extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
diff --git a/types/cote/package.json b/types/cote/package.json
new file mode 100644
index 0000000000..ce4365fc69
--- /dev/null
+++ b/types/cote/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "eventemitter2": "^4.1.0"
+  }
+}

From d679494ef1a202528321f15dce2377f6a4694fb0 Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Tue, 27 Jun 2017 02:43:01 +0300
Subject: [PATCH 156/287] Different advertisements for Subscriber, Responder
 etc

---
 types/cote/cote-tests.ts | 33 ++++++++++++++-
 types/cote/index.d.ts    | 87 ++++++++++++++++++++++++++++------------
 2 files changed, 92 insertions(+), 28 deletions(-)

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index eb2bfbf38b..25a65555d2 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -213,7 +213,7 @@ class InitialObservations {
         quitter.onAny(() => process.exit);
 
         const indecisive = new cote.Responder({ name: 'Indecisive' });
-        const callback = <T> (x: T) => Promise.resolve(x);
+        const callback = <T>(x: T) => Promise.resolve(x);
         indecisive.on('choice', callback);
         indecisive.off('choice', callback);
 
@@ -237,7 +237,10 @@ class InitialObservations {
         };
         eternity.addListener('request', handler);
 
-        const monitor = new cote.Monitor({ name: 'Monitor' });
+        const monitor = new cote.Monitor({
+            name: 'Monitor',
+            port: 8025
+        });
         monitor.setMaxListeners(1);
         monitor.once('foobar', () => {
             monitor.removeAllListeners();
@@ -246,4 +249,30 @@ class InitialObservations {
             });
         });
     }
+
+    advertisement() {
+        // Incorrect:
+        // const requester = new cote.Requester({
+        //     name: 'Requester',
+        //     respondsTo: ['foo']
+        // })
+
+        // Incorrect:
+        // const responder = new cote.Responder({
+        //     name: 'Responder',
+        //     subscribesTo: ['bar']
+        // })
+
+        // Incorrect:
+        // const publisher = new cote.Publisher({
+        //     name: 'Publisher',
+        //     requests: ['baz']
+        // })
+
+        // Incorrect:
+        // const subscriber = new cote.Subscriber({
+        //     name: 'Subscriber',
+        //     broadcasts: ['qux']
+        // })
+    }
 }
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index ff1f115e5b..7a59fea23c 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -13,7 +13,7 @@ export class Requester extends EventEmitter2 {
         /**
          * Configuration which controls the data being advertised for auto-discovery.
          */
-        advertisement: Advertisement,
+        advertisement: RequesterAdvertisement,
 
         /**
          * Controls the network-layer configuration and environments for components.
@@ -30,12 +30,22 @@ export class Requester extends EventEmitter2 {
     send<T extends Action>(action: T): Promise<any>;
 }
 
+/**
+ * Configuration which controls the data being advertised for auto-discovery.
+ */
+export interface RequesterAdvertisement extends Advertisement {
+    /**
+     * Request types that a Requester can send.
+     */
+    requests?: string[];
+}
+
 export class Responder extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
          */
-        advertisement: Advertisement,
+        advertisement: ResponderAdvertisement,
 
         /**
          * Controls the network-layer configuration and environments for components.
@@ -55,12 +65,22 @@ export class Responder extends EventEmitter2 {
     ): this;
 }
 
+/**
+ * Configuration which controls the data being advertised for auto-discovery.
+ */
+export interface ResponderAdvertisement extends Advertisement {
+    /**
+     * Response types that a Responder can listen to.
+     */
+    respondsTo?: string[];
+}
+
 export class Publisher extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
          */
-        advertisement: Advertisement,
+        advertisement: PublisherAdvertisement,
 
         /**
          * Controls the network-layer configuration and environments for components.
@@ -81,12 +101,22 @@ export class Publisher extends EventEmitter2 {
     ): void;
 }
 
+/**
+ * Configuration which controls the data being advertised for auto-discovery.
+ */
+export interface PublisherAdvertisement extends Advertisement {
+    /**
+     * Event types that a Publisher can publish.
+     */
+    broadcasts?: string[];
+}
+
 export class Subscriber extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
          */
-        advertisement: Advertisement,
+        advertisement: SubscriberAdvertisement,
 
         /**
          * Controls the network-layer configuration and environments for components.
@@ -106,6 +136,16 @@ export class Subscriber extends EventEmitter2 {
     ): this;
 }
 
+/**
+ * Configuration which controls the data being advertised for auto-discovery.
+ */
+export interface SubscriberAdvertisement extends Advertisement {
+    /**
+     * Event types that a Subscriber can listen to.
+     */
+    subscribesTo?: string[];
+}
+
 export class Sockend extends EventEmitter2 {
     /**
      * Exposes APIs directly to front-end. Make sure to use namespaces.
@@ -116,7 +156,7 @@ export class Sockend extends EventEmitter2 {
         /**
          * Configuration which controls the data being advertised for auto-discovery.
          */
-        advertisement: Advertisement,
+        advertisement: SockendAdvertisement,
 
         /**
          * Controls the network-layer configuration and environments for components.
@@ -125,12 +165,17 @@ export class Sockend extends EventEmitter2 {
     );
 }
 
+/**
+ * Configuration which controls the data being advertised for auto-discovery.
+ */
+export interface SockendAdvertisement extends ResponderAdvertisement, PublisherAdvertisement { }
+
 export class Monitor extends EventEmitter2 {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
          */
-        advertisement: Advertisement,
+        advertisement: MonitorAdvertisement,
 
         /**
          * Controls the network-layer configuration and environments for components.
@@ -141,6 +186,16 @@ export class Monitor extends EventEmitter2 {
     )
 }
 
+/**
+ * Configuration which controls the data being advertised for auto-discovery.
+ */
+export interface MonitorAdvertisement extends Advertisement {
+    /**
+     * Port for Monitor to listen on.
+     */
+    port: number | string;
+}
+
 /**
  * Displays the cote ecosystem running in your environment in a nice graph.
  *
@@ -177,26 +232,6 @@ export interface Advertisement {
      * to communicate. Think of it as `${environment}_${key}`.
      */
     key?: string;
-
-    /**
-     * Request types that a Requester can send.
-     */
-    requests?: string[];
-
-    /**
-     * Response types that a Responder can listen to.
-     */
-    respondsTo?: string[];
-
-    /**
-     * Event types that a Publisher can publish.
-     */
-    broadcasts?: string[];
-
-    /**
-     * Event types that a Subscriber can listen to.
-     */
-    subscribesTo?: string[];
 }
 
 /**

From a960214b1eb0085e2cbaafbbf53ad73985a03c7e Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Tue, 27 Jun 2017 03:37:02 +0300
Subject: [PATCH 157/287] 10+ other DiscoveryOptions

---
 types/cote/cote-tests.ts | 28 ++++++++++++++++
 types/cote/index.d.ts    | 69 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index 25a65555d2..6448111364 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -275,4 +275,32 @@ class InitialObservations {
         //     broadcasts: ['qux']
         // })
     }
+
+    discovery() {
+        new cote.Responder({ name: 'LocalUnlessForwarded' }, { address: '127.0.0.1' });
+
+        new cote.Publisher({ name: 'PassionateGreeter' }, { helloInterval: 100 });
+
+        new cote.Requester({ name: 'Optimist' }, {
+            checkInterval: 1e5,
+            nodeTimeout: 1e6
+        });
+
+        new cote.Subscriber({ name: 'Hachiko' }, { masterTimeout: 9 * 365 * 24 * 60 * 60 * 1000 });
+
+        new cote.Monitor({ name: 'HelloService', port: 2345 }, {
+            monitor: false,
+            statusLogsEnabled: false
+        });
+
+        new cote.Monitor({ name: 'OfflineLogger', port: 2346 }, {
+            disableScreen: true,
+            helloLogsEnabled: false,
+            log: true
+        });
+
+        new cote.Responder({ name: 'HearsNoneAbove' }, { ignoreProcess: true });
+
+        new cote.Requester({ name: 'OwnStatusReporter' }, { statusInterval: 100 });
+    }
 }
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index 7a59fea23c..074ba34ec0 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -238,6 +238,75 @@ export interface Advertisement {
  * Controls the network-layer configuration and environments for components.
  */
 export interface DiscoveryOptions {
+    /**
+     * Multicast address if using multicast.
+     */
     multicast?: string;
+
+    /**
+     * Broadcast address if using broadcast.
+     */
     broadcast?: string;
+
+    /**
+     * Address to bind to.
+     */
+    address?: string;
+
+    /**
+     * How often to broadcast a hello packet in milliseconds.
+     */
+    helloInterval?: number;
+
+    /**
+     * How often to to check for missing nodes in milliseconds.
+     */
+    checkInterval?: number;
+
+    /**
+     * Consider a node dead if not seen in this many milliseconds.
+     */
+    nodeTimeout?: number;
+
+    /**
+     * Consider a master node dead if not seen in this many milliseconds.
+     */
+    masterTimeout?: number;
+
+    /**
+     * Skips key equality checks when logging.
+     */
+    monitor?: boolean;
+
+    /**
+     * If false, disables `helloLogsEnabled` and `statusLogsEnabled` no matter
+     * what value they have, and also own hello log.
+     */
+    log?: boolean;
+
+    /**
+     * Notifies when another service goes online.
+     */
+    helloLogsEnabled?: boolean;
+
+    /**
+     * Notifies when another service goes online or offline. If false, disables
+     * `helloLogsEnabled` as well.
+     */
+    statusLogsEnabled?: boolean;
+
+    /**
+     * Ignores messages from other services within the same process.
+     */
+    ignoreProcess?: boolean;
+
+    /**
+     * Prevents Monitor from drawing.
+     */
+    disableScreen?: boolean;
+
+    /**
+     * Milliseconds between emissions of own status for monitoring.
+     */
+    statusInterval?: number;
 }

From 67f14093951f9b33e74f64f20ba64798fd5ff2c0 Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Wed, 28 Jun 2017 22:12:30 +0300
Subject: [PATCH 158/287] Callback API in addition to Promises

---
 types/cote/cote-tests.ts | 43 +++++++++++++++++++++++++++++++++++++++-
 types/cote/index.d.ts    | 16 +++++++++++++--
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index 6448111364..a425634dab 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -26,6 +26,27 @@ class Readme {
             .then(() => process.exit());
     }
 
+    requesterCallback() {
+        const randomRequester = new cote.Requester({
+            name: 'Random Requester',
+            namespace: 'rnd',
+            key: 'a certain key',
+            requests: ['randomRequest']
+        });
+
+        const req = {
+            type: 'randomRequest',
+            payload: {
+                val: Math.floor(Math.random() * 10)
+            }
+        };
+
+        randomRequester.send(req, res => {
+            console.log(res);
+            process.exit();
+        });
+    }
+
     responder() {
         const randomResponder = new cote.Responder({
             name: 'Random Responder',
@@ -46,6 +67,26 @@ class Readme {
         });
     }
 
+    responderCallback() {
+        const randomResponder = new cote.Responder({
+            name: 'Random Responder',
+            namespace: 'rnd',
+            key: 'a certain key',
+            respondsTo: ['randomRequest']
+        });
+
+        interface RandomRequest {
+            type: 'randomRequest';
+            payload: { val: number };
+        }
+
+        randomResponder.on('randomRequest', (req: RandomRequest, callback: (answer: number) => void) => {
+            const answer = Math.floor(Math.random() * 10);
+            console.log('request', req.payload.val, 'answering with', answer);
+            callback(answer);
+        });
+    }
+
     mongooseResponder() {
         const UserModel = require('UserModel'); // a promise-based model API
 
@@ -151,7 +192,7 @@ class Readme {
             key: 'conversion backend'
         });
 
-        responder.on('convert', (req) => {
+        responder.on('convert', (req: any) => {
             return conversionRequester.send(req); // proxy the request
         });
     }
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index 074ba34ec0..c49411f813 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -28,6 +28,15 @@ export class Requester extends EventEmitter2 {
      * @param action Request.
      */
     send<T extends Action>(action: T): Promise<any>;
+
+    /**
+     * Queues a request until a Responder is available, and once so, delivers
+     * the request. Requests are dispatched to Responders in a round-robin way.
+     *
+     * @param action Request.
+     * @param callback Function to execute after getting a result.
+     */
+    send<T extends Action>(action: T, callback: (result: any) => void): void;
 }
 
 /**
@@ -61,7 +70,10 @@ export class Responder extends EventEmitter2 {
      */
     on<T extends Action>(
         type: string | string[],
-        listener: (action: T) => Promise<any>
+        listener: (
+            ((action: T, callback: (result: any) => void) => void) |
+            ((action: T) => Promise<any>)
+        )
     ): this;
 }
 
@@ -70,7 +82,7 @@ export class Responder extends EventEmitter2 {
  */
 export interface ResponderAdvertisement extends Advertisement {
     /**
-     * Response types that a Responder can listen to.
+     * Request types that a Responder can listen to.
      */
     respondsTo?: string[];
 }

From f2a46a1629798b54b515d531e797ef18f766cbde Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Thu, 29 Jun 2017 00:05:10 +0300
Subject: [PATCH 159/287] TimeBalancedRequester and PendingBalancedRequester

---
 types/cote/cote-tests.ts | 46 ++++++++++++++++++++++++++++++++++++++++
 types/cote/index.d.ts    | 30 ++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index a425634dab..75e9b70071 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -344,4 +344,50 @@ class InitialObservations {
 
         new cote.Requester({ name: 'OwnStatusReporter' }, { statusInterval: 100 });
     }
+
+    callbackApi() {
+        // Added to Readme above, near respective Promise examples.
+    }
+
+    timeBalancedRequester() {
+        const randomRequester = new cote.TimeBalancedRequester({
+            name: 'Random Requester',
+            namespace: 'rnd',
+            key: 'a certain key',
+            requests: ['randomRequest']
+        });
+
+        const req = {
+            type: 'randomRequest',
+            payload: {
+                val: Math.floor(Math.random() * 10)
+            }
+        };
+
+        randomRequester.send(req)
+            .then(console.log)
+            .catch(console.log)
+            .then(() => process.exit());
+    }
+
+    pendingBalancedRequester() {
+        const randomRequester = new cote.PendingBalancedRequester({
+            name: 'Random Requester',
+            namespace: 'rnd',
+            key: 'a certain key',
+            requests: ['randomRequest']
+        });
+
+        const req = {
+            type: 'randomRequest',
+            payload: {
+                val: Math.floor(Math.random() * 10)
+            }
+        };
+
+        randomRequester.send(req)
+            .then(console.log)
+            .catch(console.log)
+            .then(() => process.exit());
+    }
 }
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index c49411f813..5b8df3edf1 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -218,6 +218,36 @@ export function MonitoringTool(port: number): {
     server: Server
 };
 
+/**
+ * Takes average response times of each connected socket and balances requests
+ * among them accordingly.
+ */
+export class TimeBalancedRequester extends Requester {
+    /**
+     * How long to wait for response before neglecting its calculation time,
+     * in milliseconds.
+     */
+    CALCULATION_TIMEOUT: number;
+
+    /**
+     * How many requests to make before exploring a random server for response
+     * time improvement.
+     */
+    MAX_REQUESTS: number;
+
+    /**
+     * How often to check whether a response arrived. Readonly because used in
+     * constructor right after being set.
+     */
+    readonly SAMPLE_INTERVAL: number;
+}
+
+/**
+ * Keeps track of open, pending requests for each known Responder. Each new
+ * request goes to the Responder with the minimum open requests.
+ */
+export class PendingBalancedRequester extends Requester { }
+
 /**
  * Action is nothing but object with `type`.
  */

From 08483ef15769b70415132201545292cba95c6a83 Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Thu, 29 Jun 2017 00:43:11 +0300
Subject: [PATCH 160/287] Pre-built events such as `cote:added` and
 `cote:removed`

---
 types/cote/cote-tests.ts | 50 +++++++++++++++++++++++++++++++++++
 types/cote/index.d.ts    | 57 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index 75e9b70071..8edadc6d71 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -390,4 +390,54 @@ class InitialObservations {
             .catch(console.log)
             .then(() => process.exit());
     }
+
+    lifecycle() {
+        const key = Math.random().toString();
+
+        const requester = new cote.Requester({
+            name: `${key} requester`,
+            key
+        });
+
+        const responder = new cote.Responder({
+            name: `${key} responder`,
+            key
+        });
+
+        responder.on('cote:added', ({ advertisement, type }) => {
+            console.log({
+                advertisement: {
+                    broadcasts: advertisement.broadcasts,
+                    key: advertisement.key,
+                    name: advertisement.name,
+                    namespace: advertisement.namespace,
+                    requests: advertisement.requests,
+                    respondsTo: advertisement.respondsTo,
+                    subscribesTo: advertisement.subscribesTo
+                },
+                type
+            });
+
+            requester.close();
+        });
+
+        responder.on('cote:removed', ({ advertisement, type }) => {
+            console.assert(advertisement.name === `${key} requester`);
+
+            console.log({
+                advertisement: {
+                    broadcasts: advertisement.broadcasts,
+                    key: advertisement.key,
+                    name: advertisement.name,
+                    namespace: advertisement.namespace,
+                    requests: advertisement.requests,
+                    respondsTo: advertisement.respondsTo,
+                    subscribesTo: advertisement.subscribesTo
+                },
+                type
+            });
+
+            responder.close();
+        });
+    }
 }
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index 5b8df3edf1..b7883a2966 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -8,7 +8,26 @@ import * as SocketIO from "socket.io";
 import { Stream } from "stream";
 import { Server } from "http";
 
-export class Requester extends EventEmitter2 {
+export abstract class Component extends EventEmitter2 {
+    constructor(
+        /**
+         * Configuration which controls the data being advertised for auto-discovery.
+         */
+        advertisement: Advertisement,
+
+        /**
+         * Controls the network-layer configuration and environments for components.
+         */
+        discoveryOptions?: DiscoveryOptions
+    );
+
+    /**
+     * Closes socket and stops discovery.
+     */
+    close(): void;
+}
+
+export class Requester extends Component {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -49,7 +68,7 @@ export interface RequesterAdvertisement extends Advertisement {
     requests?: string[];
 }
 
-export class Responder extends EventEmitter2 {
+export class Responder extends Component {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -62,6 +81,16 @@ export class Responder extends EventEmitter2 {
         discoveryOptions?: DiscoveryOptions
     );
 
+    /**
+     * Listens to internal `cote:added` and `cote:removed` actions.
+     *
+     * @param listener Callback.
+     */
+    on(
+        type: 'cote:added' | 'cote:removed',
+        listener: (action: Status) => void
+    ): this;
+
     /**
      * Responds to certain requests from a Requester.
      *
@@ -87,7 +116,7 @@ export interface ResponderAdvertisement extends Advertisement {
     respondsTo?: string[];
 }
 
-export class Publisher extends EventEmitter2 {
+export class Publisher extends Component {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -123,7 +152,7 @@ export interface PublisherAdvertisement extends Advertisement {
     broadcasts?: string[];
 }
 
-export class Subscriber extends EventEmitter2 {
+export class Subscriber extends Component {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -158,7 +187,7 @@ export interface SubscriberAdvertisement extends Advertisement {
     subscribesTo?: string[];
 }
 
-export class Sockend extends EventEmitter2 {
+export class Sockend extends Component {
     /**
      * Exposes APIs directly to front-end. Make sure to use namespaces.
      */
@@ -182,7 +211,7 @@ export class Sockend extends EventEmitter2 {
  */
 export interface SockendAdvertisement extends ResponderAdvertisement, PublisherAdvertisement { }
 
-export class Monitor extends EventEmitter2 {
+export class Monitor extends Component {
     constructor(
         /**
          * Configuration which controls the data being advertised for auto-discovery.
@@ -255,6 +284,22 @@ export interface Action {
     type: string;
 }
 
+/**
+ * Internal `cote:added` and `cote:removed` actions.
+ */
+export interface Status extends Action {
+    advertisement: StatusAdvertisement;
+}
+
+/**
+ * Advertisement in internal `cote:added` and `cote:removed` actions.
+ */
+export interface StatusAdvertisement extends
+    RequesterAdvertisement,
+    ResponderAdvertisement,
+    PublisherAdvertisement,
+    SubscriberAdvertisement { }
+
 /**
  * Configuration which controls the data being advertised for auto-discovery.
  */

From 76f93bba26556f2d4a0a15e1bd57d362c5a979b0 Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Thu, 29 Jun 2017 00:48:18 +0300
Subject: [PATCH 161/287] Monitor: Optional advertisement port

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

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index 8edadc6d71..908c145c61 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -440,4 +440,12 @@ class InitialObservations {
             responder.close();
         });
     }
+
+    monitorAdvertisement() {
+        const name = 'Service';
+        const port = undefined;
+
+        new cote.Monitor({ name, port });
+        new cote.Monitor({ name });
+    }
 }
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index b7883a2966..f0841c77be 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -232,9 +232,9 @@ export class Monitor extends Component {
  */
 export interface MonitorAdvertisement extends Advertisement {
     /**
-     * Port for Monitor to listen on.
+     * Port for Monitor to listen on. By default will start searching from 8000.
      */
-    port: number | string;
+    port?: number | string;
 }
 
 /**

From 15b7bac31972fbc081028937dfb1487507ca5fc9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 28 Jun 2017 15:00:56 -0700
Subject: [PATCH 162/287] Add a string-fallback overload to React.createElement

The types aren't quite as nice as when providing a string literal like
"div" or "input", but it works as well as it did before the
string-literal-overload change in #17507.
---
 types/react/index.d.ts    | 4 ++++
 types/react/test/index.ts | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 577959ae7b..6ce2919510 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -144,6 +144,10 @@ declare namespace React {
         type: keyof ReactSVG,
         props?: ClassAttributes<T> & P,
         ...children: ReactNode[]): ReactSVGElement;
+    function createElement<P extends DOMAttributes<T>, T extends Element>(
+        type: string,
+        props?: ClassAttributes<T> & P,
+        ...children: ReactNode[]): DOMElement<P, T>;
     function createElement<P>(
         type: SFC<P>,
         props?: Attributes & P,
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 27acc07d34..66b8c24bac 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -190,8 +190,12 @@ var classicElement: React.ClassicElement<Props> =
     React.createElement(ClassicComponent, props);
 var domElement: React.ReactHTMLElement<HTMLDivElement> =
     React.createElement("div");
-var htmlElement = React.createElement("input", { type: "text" });
-var svgElement = React.createElement("svg", { accentHeight: 12 });
+var literalHtmlElement = React.createElement("input", { type: "text" });
+var literalSvgElement = React.createElement("svg", { accentHeight: 12 });
+
+declare let cardhtml: React.HTMLProps<HTMLElement>;
+declare let accessKey: string;
+var nonLiteralElement = React.createElement(accessKey, cardhtml);
 
 // React.cloneElement
 var clonedElement: React.CElement<Props, ModernComponent> =

From d5eeacd63cd9639552f69bd6e0b43bb9db799f73 Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Thu, 29 Jun 2017 01:11:01 +0300
Subject: [PATCH 163/287] Rename Action to Event because no longer FSA

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

diff --git a/types/cote/cote-tests.ts b/types/cote/cote-tests.ts
index 908c145c61..8fd52a73a4 100644
--- a/types/cote/cote-tests.ts
+++ b/types/cote/cote-tests.ts
@@ -118,16 +118,16 @@ class Readme {
         });
 
         setInterval(() => {
-            const action = {
+            const event = {
                 type: 'randomUpdate',
                 payload: {
                     val: Math.floor(Math.random() * 1000)
                 }
             };
 
-            console.log('emitting', action);
+            console.log('emitting', event);
 
-            randomPublisher.publish('randomUpdate', action);
+            randomPublisher.publish('randomUpdate', event);
         }, 3000);
     }
 
@@ -245,8 +245,8 @@ class Readme {
  * @see https://github.com/makepost/DefinitelyTyped/projects/1
  */
 class InitialObservations {
-    action() {
-        const action: cote.Action = { type: 'someAction' };
+    event() {
+        const event: cote.Event = { type: 'someEvent' };
     }
 
     eventEmitter() {
diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index f0841c77be..ee6d8c4324 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -44,18 +44,18 @@ export class Requester extends Component {
      * Queues a request until a Responder is available, and once so, delivers
      * the request. Requests are dispatched to Responders in a round-robin way.
      *
-     * @param action Request.
+     * @param event Request.
      */
-    send<T extends Action>(action: T): Promise<any>;
+    send<T extends Event>(event: T): Promise<any>;
 
     /**
      * Queues a request until a Responder is available, and once so, delivers
      * the request. Requests are dispatched to Responders in a round-robin way.
      *
-     * @param action Request.
+     * @param event Request.
      * @param callback Function to execute after getting a result.
      */
-    send<T extends Action>(action: T, callback: (result: any) => void): void;
+    send<T extends Event>(event: T, callback: (result: any) => void): void;
 }
 
 /**
@@ -82,13 +82,13 @@ export class Responder extends Component {
     );
 
     /**
-     * Listens to internal `cote:added` and `cote:removed` actions.
+     * Listens to internal `cote:added` and `cote:removed` events.
      *
      * @param listener Callback.
      */
     on(
         type: 'cote:added' | 'cote:removed',
-        listener: (action: Status) => void
+        listener: (event: Status) => void
     ): this;
 
     /**
@@ -97,11 +97,11 @@ export class Responder extends Component {
      * @param type Type. May be wildcarded or namespaced like in EventEmitter2.
      * @param listener Callback. Should return a result.
      */
-    on<T extends Action>(
+    on<T extends Event>(
         type: string | string[],
         listener: (
-            ((action: T, callback: (result: any) => void) => void) |
-            ((action: T) => Promise<any>)
+            ((event: T, callback: (result: any) => void) => void) |
+            ((event: T) => Promise<any>)
         )
     ): this;
 }
@@ -134,11 +134,11 @@ export class Publisher extends Component {
      * there are no Subscribers listening, the event is lost.
      *
      * @param type EventEmitter-compatible type.
-     * @param action Request.
+     * @param event Request.
      */
-    publish<T extends Action>(
+    publish<T extends Event>(
         type: string,
-        action: T
+        event: T
     ): void;
 }
 
@@ -171,9 +171,9 @@ export class Subscriber extends Component {
      * @param type Type. May be wildcarded or namespaced like in EventEmitter2.
      * @param listener Callback. Returns nothing.
      */
-    on<T extends Action>(
+    on<T extends Event>(
         type: string | string[],
-        listener: (action: T) => void
+        listener: (event: T) => void
     ): this;
 }
 
@@ -278,21 +278,21 @@ export class TimeBalancedRequester extends Requester {
 export class PendingBalancedRequester extends Requester { }
 
 /**
- * Action is nothing but object with `type`.
+ * Event is nothing but object with `type`.
  */
-export interface Action {
+export interface Event {
     type: string;
 }
 
 /**
- * Internal `cote:added` and `cote:removed` actions.
+ * Internal `cote:added` and `cote:removed` events.
  */
-export interface Status extends Action {
+export interface Status extends Event {
     advertisement: StatusAdvertisement;
 }
 
 /**
- * Advertisement in internal `cote:added` and `cote:removed` actions.
+ * Advertisement in internal `cote:added` and `cote:removed` events.
  */
 export interface StatusAdvertisement extends
     RequesterAdvertisement,

From 4634edd7d0bd7b627580fd9fe7913b57283541f0 Mon Sep 17 00:00:00 2001
From: Jayson Harshbarger <hypercubed@gmail.com>
Date: Wed, 28 Jun 2017 16:41:53 -0600
Subject: [PATCH 164/287] Add missing bounds value from QuillOptionsStatic

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

diff --git a/types/quill/index.d.ts b/types/quill/index.d.ts
index 73a877815f..91124814f5 100644
--- a/types/quill/index.d.ts
+++ b/types/quill/index.d.ts
@@ -41,7 +41,8 @@ declare namespace Quill {
         placeholder?: string,
         readOnly?: boolean,
         theme?: string,
-        formats?: string[]
+        formats?: string[],
+        bounds?: HTMLElement | string
     }
 
     export interface BoundsStatic {

From 15c641e2d2772600b352f106bb4760ec6639a585 Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Thu, 29 Jun 2017 02:01:54 +0300
Subject: [PATCH 165/287] Remove eventemitter2 because it bundles own types now

---
 notNeededPackages.json                     |   6 +
 types/eventemitter2/eventemitter2-tests.ts | 101 --------
 types/eventemitter2/index.d.ts             | 258 ---------------------
 types/eventemitter2/tsconfig.json          |  23 --
 4 files changed, 6 insertions(+), 382 deletions(-)
 delete mode 100644 types/eventemitter2/eventemitter2-tests.ts
 delete mode 100644 types/eventemitter2/index.d.ts
 delete mode 100644 types/eventemitter2/tsconfig.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index d6e99fbf9b..d6860f67b9 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -138,6 +138,12 @@
             "sourceRepoURL": "https://github.com/loopline-systems/electron-builder",
             "asOfVersion": "2.8.0"
         },
+        {
+            "libraryName": "eventemitter2",
+            "typingsPackageName": "eventemitter2",
+            "sourceRepoURL": "https://github.com/asyncly/EventEmitter2",
+            "asOfVersion": "4.1.0"
+        },
         {
             "libraryName": "EventEmitter3",
             "typingsPackageName": "eventemitter3",
diff --git a/types/eventemitter2/eventemitter2-tests.ts b/types/eventemitter2/eventemitter2-tests.ts
deleted file mode 100644
index 8a7849abfa..0000000000
--- a/types/eventemitter2/eventemitter2-tests.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-// Example for CommonJS/AMD
-/*
-import eventemitter2 = require("eventemitter2");
-var EventEmitter2 = eventemitter2.EventEmitter2;
-
-class Child extends eventemitter2.EventEmitter2 {
-}
-*/
-
-// This class definition doesn't work in CommonJS/AMD.
-class Child extends EventEmitter2 {
-}
-
-var server = new EventEmitter2();
-
-function testConfiguration() {
-    var foo = new EventEmitter2({
-        wildcard: true,
-        delimiter: '::',
-        newListener: false,
-        maxListeners: 20,
-        verboseMemoryLeak: true
-    });
-    var bar = new EventEmitter2({});
-    var bazz = new EventEmitter2();
-}
-
-function testAddListener() {
-    server.addListener('data', function (value1: any, value2: any, value3: any) {
-        console.log('The event was raised!');
-    });
-
-    server.addListener('data', function (value: any) {
-        console.log('The event was raised!');
-    });
-}
-
-function testOn() {
-    server.on('data', function (value1: any, value2: any, value3: any) {
-        console.log('The event was raised!');
-    });
-
-    server.on('data', function (value: any) {
-        console.log('The event was raised!');
-    });
-}
-
-function testOnAny() {
-    server.onAny(function (value: any) {
-        console.log('All events trigger this.');
-    });
-}
-
-function testOffAny() {
-    server.offAny(function (value: any) {
-        console.log('The event was raised!');
-    });
-}
-
-function testOnce() {
-    server.once('get', function (value: any) {
-        console.log('Ah, we have our first value!');
-    });
-}
-
-function testMany() {
-    server.many('get', 4, function (value: any) {
-        console.log('This event will be listened to exactly four times.');
-    });
-}
-
-function testRemoveListener() {
-    var callback = function (value: any) {
-        console.log('someone connected!');
-    };
-    server.on('get', callback);
-    server.removeListener('get', callback);
-}
-
-function testRemoveAllListeners() {
-    server.removeAllListeners(["test::event", "another::test::event"]);
-    server.removeAllListeners("test");
-    server.removeAllListeners();
-}
-
-function testSetMaxListeners() {
-    server.setMaxListeners(40);
-}
-
-function testListeners() {
-    console.log(server.listeners('get'));
-}
-
-function testListenersAny() {
-    console.log(server.listenersAny()[0]);
-}
-
-function testEmit() {
-    server.emit('foo.bazz');
-    server.emit(['foo', 'bar']);
-}
diff --git a/types/eventemitter2/index.d.ts b/types/eventemitter2/index.d.ts
deleted file mode 100644
index 33ffe20b09..0000000000
--- a/types/eventemitter2/index.d.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-// Type definitions for EventEmitter2 v2.2.0
-// Project: https://github.com/asyncly/EventEmitter2
-// Definitions by: ryiwamoto <https://github.com/ryiwamoto/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface EventEmitter2Configuration {
-    /**
-     * use wildcards
-     */
-    wildcard?: boolean;
-
-    /**
-     * the delimiter used to segment namespaces, defaults to `.`.
-     */
-    delimiter?: string;
-
-    /**
-     * if you want to emit the newListener event set to true.
-     */
-    newListener?: boolean;
-
-    /**
-     * max listeners that can be assigned to an event, default 10.
-     */
-    maxListeners?: number;
-
-    /**
-     * show event name in memory leak message when more than maximum amount of listeners is assigned, default false
-     */
-    verboseMemoryLeak?: boolean;
-}
-
-declare class EventEmitter2 {
-    /**
-     * @param conf
-     */
-    constructor(conf?: EventEmitter2Configuration);
-
-    /**
-     * Adds a listener to the end of the listeners array for the specified event.
-     * @param event
-     * @param listener
-     */
-    addListener(event: string, listener: Function): EventEmitter2;
-
-    /**
-     * Adds a listener to the end of the listeners array for the specified event.
-     * @param event
-     * @param listener
-     */
-    on(event: string | string[], listener: Function): EventEmitter2;
-
-    /**
-     * Adds a listener that will be fired when any event is emitted.
-     * @param listener
-     */
-    onAny(listener: Function): EventEmitter2;
-
-    /**
-     * Removes the listener that will be fired when any event is emitted.
-     * @param listener
-     */
-    offAny(listener?: Function): EventEmitter2;
-
-    /**
-     * Adds a one time listener for the event.
-     * The listener is invoked only the first time the event is fired, after which it is removed.
-     * @param event
-     * @param listener
-     */
-    once(event: string, listener: Function): EventEmitter2;
-
-    /**
-     * Adds a listener that will execute n times for the event before being removed.
-     * The listener is invoked only the first n times the event is fired, after which it is removed.
-     * @param event
-     * @param timesToListen
-     * @param listener
-     */
-    many(event: string, timesToListen: number, listener: Function): EventEmitter2;
-
-    /**
-     * Remove a listener from the listener array for the specified event.
-     * Caution: changes array indices in the listener array behind the listener.
-     * @param event
-     * @param listener
-     */
-    removeListener(event: string, listener: Function): EventEmitter2;
-
-    /**
-     * Remove a listener from the listener array for the specified event.
-     * Caution: changes array indices in the listener array behind the listener.
-     * @param event
-     * @param listener
-     */
-    off(event: string, listener: Function): EventEmitter2;
-
-    /**
-     * Removes all listeners, or those of the specified event.
-     * @param event
-     */
-    removeAllListeners(event?: string): EventEmitter2;
-
-    /**
-     * Removes all listeners, or those of the specified event.
-     * @param events
-     */
-    removeAllListeners(events: string[]): EventEmitter2;
-
-    /**
-     * By default EventEmitters will print a warning if more than 10 listeners are added to it.
-     * This is a useful default which helps finding memory leaks.
-     * Obviously not all Emitters should be limited to 10. This function allows that to be increased.
-     * Set to zero for unlimited.
-     * @param n
-     */
-    setMaxListeners(n: number): void;
-
-    /**
-     * Returns an array of listeners for the specified event. This array can be manipulated, e.g. to remove listeners.
-     * @param event
-     */
-    listeners(event: string): Function[];
-
-    /**
-     * Returns an array of listeners that are listening for any event that is specified.
-     * This array can be manipulated, e.g. to remove listeners.
-     */
-    listenersAny(): Function[];
-
-    /**
-     * Execute each of the listeners that may be listening for the specified event name in order with the list of arguments.
-     * @param event
-     * @param args
-     */
-    emit(event: string | string[], ...args: any[]): boolean;
-
-    /**
-     * Execute each of the listeners that may be listening for the specified event name in order with the list of arguments.
-     * @param event
-     */
-    emit(event: string[]): boolean;
-}
-
-declare module "eventemitter2" {
-    export class EventEmitter2 {
-        /**
-         * @param conf
-         */
-        constructor(conf?: EventEmitter2Configuration);
-
-        /**
-         * Adds a listener to the end of the listeners array for the specified event.
-         * @param event
-         * @param listener
-         */
-        addListener(event: string, listener: Function): EventEmitter2;
-
-        /**
-         * Adds a listener to the end of the listeners array for the specified event.
-         * @param event
-         * @param listener
-         */
-        on(event: string | string[], listener: Function): EventEmitter2;
-
-        /**
-         * Adds a listener that will be fired when any event is emitted.
-         * @param listener
-         */
-        onAny(listener: Function): EventEmitter2;
-
-        /**
-         * Removes the listener that will be fired when any event is emitted.
-         * @param listener
-         */
-        offAny(listener: Function): EventEmitter2;
-
-        /**
-         * Adds a one time listener for the event.
-         * The listener is invoked only the first time the event is fired, after which it is removed.
-         * @param event
-         * @param listener
-         */
-        once(event: string, listener: Function): EventEmitter2;
-
-        /**
-         * Adds a listener that will execute n times for the event before being removed.
-         * The listener is invoked only the first n times the event is fired, after which it is removed.
-         * @param event
-         * @param timesToListen
-         * @param listener
-         */
-        many(event: string, timesToListen: number, listener: Function): EventEmitter2;
-
-        /**
-         * Remove a listener from the listener array for the specified event.
-         * Caution: changes array indices in the listener array behind the listener.
-         * @param event
-         * @param listener
-         */
-        removeListener(event: string, listener: Function): EventEmitter2;
-
-        /**
-         * Remove a listener from the listener array for the specified event.
-         * Caution: changes array indices in the listener array behind the listener.
-         * @param event
-         * @param listener
-         */
-        off(event: string, listener: Function): EventEmitter2;
-
-        /**
-         * Removes all listeners, or those of the specified event.
-         * @param event
-         */
-        removeAllListeners(event?: string): EventEmitter2;
-
-        /**
-         * Removes all listeners, or those of the specified event.
-         * @param events
-         */
-        removeAllListeners(events: string[]): EventEmitter2;
-
-        /**
-         * By default EventEmitters will print a warning if more than 10 listeners are added to it.
-         * This is a useful default which helps finding memory leaks.
-         * Obviously not all Emitters should be limited to 10. This function allows that to be increased.
-         * Set to zero for unlimited.
-         * @param n
-         */
-        setMaxListeners(n: number): void;
-
-        /**
-         * Returns an array of listeners for the specified event. This array can be manipulated, e.g. to remove listeners.
-         * @param event
-         */
-        listeners(event: string): Function[];
-
-        /**
-         * Returns an array of listeners that are listening for any event that is specified.
-         * This array can be manipulated, e.g. to remove listeners.
-         */
-        listenersAny(): Function[];
-
-        /**
-         * Execute each of the listeners that may be listening for the specified event name in order with the list of arguments.
-         * @param event
-         * @param args
-         */
-        emit(event: string | string[], ...args: any[]): boolean;
-
-        /**
-         * Execute each of the listeners that may be listening for the specified event name in order with the list of arguments.
-         * @param event
-         */
-        emit(event: string[]): boolean;
-    }
-}
-
diff --git a/types/eventemitter2/tsconfig.json b/types/eventemitter2/tsconfig.json
deleted file mode 100644
index 5df8f04c40..0000000000
--- a/types/eventemitter2/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "eventemitter2-tests.ts"
-    ]
-}
\ No newline at end of file

From dd1492d8b32705c25e239748c549cb302e7efb2c Mon Sep 17 00:00:00 2001
From: makepost <makepost@firemail.cc>
Date: Thu, 29 Jun 2017 02:04:29 +0300
Subject: [PATCH 166/287] Import eventemitter2 like pikaday types import moment

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

diff --git a/types/cote/index.d.ts b/types/cote/index.d.ts
index ee6d8c4324..f6c60c54a2 100644
--- a/types/cote/index.d.ts
+++ b/types/cote/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: makepost <https://github.com/makepost>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { EventEmitter2 } from "./node_modules/eventemitter2";
+import { EventEmitter2 } from "eventemitter2";
 import * as SocketIO from "socket.io";
 import { Stream } from "stream";
 import { Server } from "http";

From 371c22e0dcc77e129be89a197b25e930ae9823e8 Mon Sep 17 00:00:00 2001
From: prakarshpandey <ppandey@g.hmc.edu>
Date: Wed, 28 Jun 2017 16:28:26 -0700
Subject: [PATCH 167/287] Fixed the index and test files to conform to
 DefinitelyTyped standards

---
 types/react-app/index.d.ts          | 17 +++++++++--------
 types/react-app/react-app-tests.tsx | 12 ++++++------
 types/react-app/tsconfig.json       |  3 ++-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/types/react-app/index.d.ts b/types/react-app/index.d.ts
index 3fee3b6cf7..bd68aed103 100644
--- a/types/react-app/index.d.ts
+++ b/types/react-app/index.d.ts
@@ -1,12 +1,13 @@
-// Type definitions for react-app 1.0.0-alpha.3
+// Type definitions for react-app 1.0
 // Project: https://github.com/kriasoft/react-app#readme
 // Definitions by: Prakarsh Pandey <https://github.com/prakarshpandey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Typescript Version: 2.3
 
 import * as React from 'react';
 
 export interface LinkProps {
-    to: string | object;
+    to: string;
     onClick?(): void;
     className?: string;
 }
@@ -22,19 +23,19 @@ export interface RouteProps { // takes the form of universal-router routes
 
 export interface ChildProps {
     path: string;
-    action(params: any): object;
+    action(params: any): any;
 }
 
 export interface CreateAppObject {
     routes: RouteProps;
-    context: object;
+    context: {};
     container: Element | null;
 }
 
 // exporting the createApp function
 export function createApp(createAppObject: CreateAppObject): JSX.Element;
 
-export const Link: React.ComponentClass<LinkProps>;
-export const Layout: React.ComponentClass<LayoutProps>;
-export const Header: React.ComponentClass<{}>;
-export const Navigation: React.ComponentClass<{}>;
+export class Link extends React.Component<LinkProps, {}> {}
+export class Layout extends React.Component<LayoutProps, {}> {}
+export class Header extends React.Component<never, {}> {}
+export class Navigation extends React.Component<never, {}> {}
diff --git a/types/react-app/react-app-tests.tsx b/types/react-app/react-app-tests.tsx
index f19b436412..3c33f36944 100644
--- a/types/react-app/react-app-tests.tsx
+++ b/types/react-app/react-app-tests.tsx
@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { Navigation, Link, Layout, Header, createApp } from './index';
+import { Navigation, Link, Layout, Header, createApp } from 'react-app';
 
 const store = {};
 const routes = {
     path: '/',
-    children: {
-        fooRoute: {
-            path = '/',
+    children: [
+        {
+            path: '/',
             action() {
                 return {
                     title: 'Foo Page',
@@ -14,7 +14,7 @@ const routes = {
                 };
             }
         },
-        barRoute: {
+        {
             path: '/bar',
             action() {
                 return {
@@ -23,7 +23,7 @@ const routes = {
                 };
             }
         }
-    }
+    ]
 };
 
 <Link to="/bar" className="a-link"/>;
diff --git a/types/react-app/tsconfig.json b/types/react-app/tsconfig.json
index 3a673038be..b1cf94dbd6 100644
--- a/types/react-app/tsconfig.json
+++ b/types/react-app/tsconfig.json
@@ -9,6 +9,7 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "baseUrl": "../",
+        "jsx": "react",
         "typeRoots": [
             "../"
         ],
@@ -18,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "react-app-tests.ts"
+        "react-app-tests.tsx"
     ]
 }

From 30e9622c54ad957959624670e2eb6856644255ad Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Wed, 28 Jun 2017 21:34:49 -0400
Subject: [PATCH 168/287] Added definitions for react-native-svg-uri

---
 types/react-native-svg-uri/index.d.ts         | 40 +++++++++++++++++++
 .../react-native-svg-uri-tests.tsx            | 13 ++++++
 types/react-native-svg-uri/tsconfig.json      | 23 +++++++++++
 types/react-native-svg-uri/tslint.json        |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 types/react-native-svg-uri/index.d.ts
 create mode 100644 types/react-native-svg-uri/react-native-svg-uri-tests.tsx
 create mode 100644 types/react-native-svg-uri/tsconfig.json
 create mode 100644 types/react-native-svg-uri/tslint.json

diff --git a/types/react-native-svg-uri/index.d.ts b/types/react-native-svg-uri/index.d.ts
new file mode 100644
index 0000000000..60347a78f2
--- /dev/null
+++ b/types/react-native-svg-uri/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for react-native-svg-uri 1.2
+// Project: https://github.com/matiascba/react-native-svg-uri#readme
+// Definitions by: Kyle Roach <https://github.com/iRoachie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+import { ImageURISource } from 'react-native';
+
+export interface SvgUriProps {
+  /**
+   * The width of the rendered svg
+   */
+  width?: number | string;
+
+  /**
+   * The height of the rendered svg
+   */
+  height?: number | string;
+
+  /**
+   * Source path for the .svg file
+   * Expects a require('path') to the file or object with uri.
+   * e.g. source={require('my-path')}
+   * e.g. source={{ur: 'my-path'}}
+   */
+  source?: ImageURISource;
+
+  /**
+   * Direct svg code to render. Similar to inline svg
+   */
+  svgXmlData?: string;
+
+  /**
+   * Fill color for the svg object
+   */
+  fill?: string;
+}
+
+export default class SvgUri extends React.Component<SvgUriProps, {}> { }
diff --git a/types/react-native-svg-uri/react-native-svg-uri-tests.tsx b/types/react-native-svg-uri/react-native-svg-uri-tests.tsx
new file mode 100644
index 0000000000..21ee0784a5
--- /dev/null
+++ b/types/react-native-svg-uri/react-native-svg-uri-tests.tsx
@@ -0,0 +1,13 @@
+import * as React from 'react';
+import { View } from 'react-native';
+import SvgUri from 'react-native-svg-uri';
+
+const TestSvgUri = () => (
+  <View>
+    <SvgUri
+      width="200"
+      height="200"
+      source={{ uri: 'http://thenewcode.com/assets/images/thumbnails/homer-simpson.svg' }}
+    />
+  </View>
+);
diff --git a/types/react-native-svg-uri/tsconfig.json b/types/react-native-svg-uri/tsconfig.json
new file mode 100644
index 0000000000..1dd27f80ff
--- /dev/null
+++ b/types/react-native-svg-uri/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true,
+    "jsx": "react-native"
+  },
+  "files": [
+    "index.d.ts",
+    "react-native-svg-uri-tests.tsx"
+  ]
+}
diff --git a/types/react-native-svg-uri/tslint.json b/types/react-native-svg-uri/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-svg-uri/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ac8c3392a03ead2a2c47b9e822b8327bbd6e41d6 Mon Sep 17 00:00:00 2001
From: tsai phan <phanalpha@hotmail.com>
Date: Thu, 29 Jun 2017 13:24:40 +0800
Subject: [PATCH 169/287] route params, headerBackTitle fixups or so.

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 1d07494104..6f2011da3c 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -5,6 +5,7 @@
 //                 fangpenlin <https://github.com/fangpenlin>
 //                 abrahambotros <https://github.com/abrahambotros>
 //                 petejkim <https://github.com/petejkim>
+//                 phanalpha <https://github.com/phanalpha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -86,7 +87,7 @@ export type NavigationLeafRoute<Params> = {
    * Params passed to this route when navigating to it,
    * e.g. `{ car_id: 123 }` in a route that displays a car.
    */
-  params?: Params,
+  params: Params,
 };
 
 export type NavigationStateRoute<NavigationLeafRouteParams> = NavigationLeafRoute<NavigationLeafRouteParams> & {
@@ -262,7 +263,7 @@ export type NavigationStackScreenOptions = NavigationScreenOptions & {
   headerTitleStyle?: Style,
   headerTintColor?: string,
   headerLeft?: React.ReactElement<any>,
-  headerBackTitle?: string,
+  headerBackTitle?: string | null,
   headerTruncatedBackTitle?: string,
   headerBackTitleStyle?: Style,
   headerPressColorAndroid?: string,
@@ -651,3 +652,22 @@ export interface NavigationScreenProps<Params> {
 /**
  * END CUSTOM CONVENIENCE INTERFACES
  */
+
+
+/*
+ * Header
+ */
+
+// src/views/HeaderBackButton.js
+
+export interface HeaderBackButtonProps {
+  onPress?: () => void,
+  pressColorAndroid?: string,
+  title?: string,
+  titleStyle?: TextStyle,
+  tintColor?: string,
+  truncatedTitle?: string,
+  width?: number,
+}
+
+export const HeaderBackButton: React.ComponentClass<HeaderBackButtonProps>;

From 2f78dfbf51b6cce32ba8df2cb711af9ceaed22a3 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Thu, 29 Jun 2017 08:09:22 +0200
Subject: [PATCH 170/287] Added version

---
 types/activex-adodb/index.d.ts     |  2 +-
 types/activex-scripting/index.d.ts |  2 +-
 types/activex-wia/index.d.ts       | 22 +++++++++++++---------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 2fa62632ad..ec5d67167a 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft ActiveX Data Objects
+// Type definitions for Microsoft ActiveX Data Objects 6.1
 // Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index e1af9535fd..7ad0ece794 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Microsoft Scripting Runtime
+// Type definitions for Microsoft Scripting Runtime 1.0
 // Project: https://msdn.microsoft.com/en-us/library/bstcxhf7.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index 51ef3c59f7..7d7cbae727 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Windows Image Acquisition
+// Type definitions for Windows Image Acquisition 2.0
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/ms630368(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,16 +6,18 @@
 
 declare namespace WIA {
     /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */
-    const enum CommandID {
+    // uncomment when DefinitelyTyped supports Typescript 2.4 (end of July 2017)
+    /*const enum CommandID {
         wiaCommandChangeDocument = '{04E725B0-ACAE-11D2-A093-00C04F72DC3C}',
         wiaCommandDeleteAllItems = '{E208C170-ACAD-11D2-A093-00C04F72DC3C}',
         wiaCommandSynchronize = '{9B26B7B2-ACAD-11D2-A093-00C04F72DC3C}',
         wiaCommandTakePicture = '{AF933CAC-ACAD-11D2-A093-00C04F72DC3C}',
         wiaCommandUnloadDocument = '{1F3B3D8E-ACAE-11D2-A093-00C04F72DC3C}'
-    }
+    }*/
 
     /** String versions of globally unique identifiers (GUIDs) that identify DeviceManager events. */
-    const enum EventID {
+    // uncomment when DefinitelyTyped supports Typescript 2.4 (end of July 2017)
+    /*const enum EventID {
         wiaEventDeviceConnected = '{A28BBADE-64B6-11D2-A231-00C04FA31809}',
         wiaEventDeviceDisconnected = '{143E4E83-6497-11D2-A231-00C04FA31809}',
         wiaEventItemCreated = '{4C8F4EF5-E14F-11D2-B326-00C04F68CE61}',
@@ -29,22 +31,24 @@ declare namespace WIA {
         wiaEventScanImage4 = '{A65B704A-7F3C-4447-A75D-8A26DFCA1FDF}',
         wiaEventScanOCRImage = '{9D095B89-37D6-4877-AFED-62A297DC6DBE}',
         wiaEventScanPrintImage = '{B441F425-8C6E-11D2-977A-0000F87A926F}'
-    }
+    }*/
 
     /** String versions of globally unique identifiers (GUIDs) that indicate the file format of an image. */
-    const enum FormatID {
+    // uncomment when DefinitelyTyped supports Typescript 2.4 (end of July 2017)
+    /*const enum FormatID {
         wiaFormatBMP = '{B96B3CAB-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatGIF = '{B96B3CB0-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatJPEG = '{B96B3CAE-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatPNG = '{B96B3CAF-0728-11D3-9D7B-0000F81EF32E}',
         wiaFormatTIFF = '{B96B3CB1-0728-11D3-9D7B-0000F81EF32E}'
-    }
+    }*/
 
     /** Miscellaneous string constants */
-    const enum Miscellaneous {
+    // uncomment when DefinitelyTyped supports Typescript 2.4 (end of July 2017)
+    /*const enum Miscellaneous {
         wiaAnyDeviceID = '*',
         wiaIDUnknown = '{00000000-0000-0000-0000-000000000000}'
-    }
+    }*/
 
     /**
      * The WiaDeviceType enumeration specifies the type of device attached to a user's computer. Use the Type property on the DeviceInfo object or the Device

From fd0b55db919d02ee3533184bc48784bbc984e5a6 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Thu, 29 Jun 2017 08:10:14 +0200
Subject: [PATCH 171/287] Commented out string-valued enums (pending Typescript
 2.4, circa end of July 2017)

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

diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index e7e2fcd506..8384291f5d 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -3,17 +3,32 @@
 // Convert a file
 let commonDialog = new ActiveXObject('WIA.CommonDialog');
 let img = commonDialog.ShowAcquireImage();
-if (img.FormatID !== WIA.FormatID.wiaFormatJPEG) {
+
+// when DefinitelyTyped supports Typescript 2.4 -- end of July 2017, replace these:
+let jpegFormatID =  '{B96B3CAE-0728-11D3-9D7B-0000F81EF32E}';
+if (img.FormatID !== jpegFormatID) {
+    let ip = new ActiveXObject('WIA.ImageProcess');
+    ip.Filters.Add(ip.FilterInfos.Item('Convert').FilterID);
+    ip.Filters.Item(1).Properties.Item('FormatID').Value = jpegFormatID;
+    img = ip.Apply(img);
+}
+// with this:
+/*if (img.FormatID !== WIA.FormatID.wiaFormatJPEG) {
     let ip = new ActiveXObject('WIA.ImageProcess');
     ip.Filters.Add(ip.FilterInfos.Item('Convert').FilterID);
     ip.Filters.Item(1).Properties.Item('FormatID').Value = WIA.FormatID.wiaFormatJPEG;
     img = ip.Apply(img);
-}
+}*/
 
 // Take a picture
 let dev = commonDialog.ShowSelectDevice();
 if (dev.Type === WIA.WiaDeviceType.CameraDeviceType) {
-    let itm = dev.ExecuteCommand(WIA.CommandID.wiaCommandTakePicture);
+    // when DefinitelyTyped supports Typescript 2.4 -- end of July 2017, replace these:
+    let commandID = '{AF933CAC-ACAD-11D2-A093-00C04F72DC3C}';
+    let itm = dev.ExecuteCommand(commandID);
+
+    // with this:
+    // let itm = dev.ExecuteCommand(WIA.CommandID.wiaCommandTakePicture);
 }
 
 // Display detailed property information

From 7f2afd59a6c4ca609f9ec1b9a9c1fd6f2cf9cea0 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Thu, 29 Jun 2017 08:16:38 +0200
Subject: [PATCH 172/287] Removed useless generated enums

---
 types/activex-scripting/index.d.ts | 33 ------------------------------
 1 file changed, 33 deletions(-)

diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index 7ad0ece794..c4a64c54af 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -4,39 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Scripting {
-    const enum __MIDL___MIDL_itf_scrrun_0000_0000_0001 {
-        Alias = 1024,
-        Archive = 32,
-        Compressed = 2048,
-        Directory = 16,
-        Hidden = 2,
-        Normal = 0,
-        ReadOnly = 1,
-        System = 4,
-        Volume = 8
-    }
-
-    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0001 {
-        CDRom = 4,
-        Fixed = 2,
-        RamDisk = 5,
-        Remote = 3,
-        Removable = 1,
-        UnknownType = 0
-    }
-
-    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0002 {
-        SystemFolder = 1,
-        TemporaryFolder = 2,
-        WindowsFolder = 0
-    }
-
-    const enum __MIDL___MIDL_itf_scrrun_0001_0001_0003 {
-        StdErr = 2,
-        StdIn = 0,
-        StdOut = 1
-    }
-
     const enum CompareMethod {
         BinaryCompare = 0,
         DatabaseCompare = 2,

From daa1227076365d72e1ca65b9a38a4d723066de0e Mon Sep 17 00:00:00 2001
From: Flarna <deb2001-github@yahoo.de>
Date: Thu, 29 Jun 2017 09:28:22 +0200
Subject: [PATCH 173/287] correct whitespace related lint error

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 8eccbde35b..36464912f3 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -4508,7 +4508,9 @@ declare module "_debugger" {
 }
 
 
-// Async Hooks module: https://nodejs.org/api/async_hooks.html
+/**
+ * Async Hooks module: https://nodejs.org/api/async_hooks.html
+ */
 declare module "async_hooks" {
     /**
      * Returns the asyncId of the current execution context.
@@ -4522,30 +4524,33 @@ declare module "async_hooks" {
 
     export interface HookCallbacks {
         /**
-         * Called when a class is constructed that has the possibility to emit an asynchronous event. 
+         * Called when a class is constructed that has the possibility to emit an asynchronous event.
          * @param asyncId a unique ID for the async resource
          * @param type the type of the async resource
          * @param triggerId the unique ID of the async resource in whose execution context this async resource was created
          * @param resource reference to the resource representing the async operation, needs to be released during destroy
          */
         init?(asyncId: number, type: string, triggerId: number, resource: Object): void;
+
         /**
          * When an asynchronous operation is initiated or completes a callback is called to notify the user.
          * The before callback is called just before said callback is executed.
          * @param asyncId the unique identifier assigned to the resource about to execute the callback.
          */
         before?(asyncId: number): void;
+
         /**
          * Called immediately after the callback specified in before is completed.
          * @param asyncId the unique identifier assigned to the resource which has executed the callback.
          */
         after?(asyncId: number): void;
+
         /**
          * Called after the resource corresponding to asyncId is destroyed
          * @param asyncId a unique ID for the async resource
          */
         destroy?(asyncId: number): void;
-	}
+    }
 
     export interface AsyncHook {
         /**

From d6f4265b368a2e02fc822965165c11a4f7183689 Mon Sep 17 00:00:00 2001
From: xialeistudio <1065890063@qq.com>
Date: Thu, 29 Jun 2017 15:50:08 +0800
Subject: [PATCH 174/287] remove qiniu

---
 notNeededPackages.json     |   6 +
 types/qiniu/index.d.ts     | 262 -------------------------------------
 types/qiniu/qiniu-tests.ts | 156 ----------------------
 types/qiniu/tsconfig.json  |  22 ----
 types/qiniu/tslint.json    |   1 -
 5 files changed, 6 insertions(+), 441 deletions(-)
 delete mode 100644 types/qiniu/index.d.ts
 delete mode 100644 types/qiniu/qiniu-tests.ts
 delete mode 100644 types/qiniu/tsconfig.json
 delete mode 100644 types/qiniu/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index d6e99fbf9b..d44f9a3061 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -420,6 +420,12 @@
             "sourceRepoURL": "https://github.com/angular/protractor",
             "asOfVersion": "4.0.0"
         },
+        {
+            "libraryName": "qiniu",
+            "typingsPackageName": "qiniu",
+            "sourceRepoURL": "git@github.com:qiniu/nodejs-sdk.git",
+            "asOfVersion": "6.1.0"
+        },
         {
             "libraryName": "Raven JS",
             "typingsPackageName": "raven-js",
diff --git a/types/qiniu/index.d.ts b/types/qiniu/index.d.ts
deleted file mode 100644
index 03eedd4914..0000000000
--- a/types/qiniu/index.d.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-// Type definitions for qiniu 6.1
-// Project: https://github.com/qiniu/nodejs-sdk
-// Definitions by: xialeistudio <https://github.com/xialeistudio>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace qiniu {
-    type onret = (e?: any, result?: any, res?: any) => void;
-    class conf {
-        static ACCESS_KEY: string;
-        static SECRET_KEY: string;
-        static USER_AGENT: string;
-        static UP_HOST: string;
-        static RS_HOST: string;
-        static RSF_HOST: string;
-        static API_HOST: string;
-        static RPC_TIMEOUT: number;
-        static UC_HOST: string;
-        static UP_HTTPS_HOST: string;
-        static SCHEME: string;
-        static AUTOZONE: boolean;
-        static BUCKET: string | null;
-        static EXPIRE: number;
-    }
-    namespace auth {
-        class Mac {
-            accessKey: string;
-            secretKey: string;
-
-            constructor(accessKey: string, secretKey: string);
-        }
-    }
-    namespace io {
-        const UNDEFINED_KEY: string;
-        class PutExtra {
-            params: any;
-            mimeType?: string;
-            crc32?: string;
-            checkCrc?: number;
-
-            constructor(params?: any, mimeType?: string, crc32?: string, checkCrc?: number);
-        }
-        class PutRet {
-            hash?: string;
-            key?: string;
-
-            constructor(hash?: string, key?: string);
-        }
-
-        function putReadable(uptoken: string, key?: string, rs?: any, extra?: any, onret?: onret): any;
-
-        function put(uptoken: string, key?: string, body?: any, extra?: any, onret?: onret): any;
-
-        function putWithoutKey(uptoken: string, body?: any, extra?: any, onret?: onret): any;
-
-        function putFile(uptoken: string, key?: string, localFile?: string, extra?: any, onret?: onret): any;
-
-        function putFileWithoutKey(uptoken: string, localFile?: string, extra?: any, onret?: onret): any;
-    }
-    namespace util {
-        function urlsafeBase64Encode(jsonFlags: any): string;
-
-        function base64ToUrlSafe(v: string): string;
-
-        function hmacSha1(encodedFlags: any, secretKey: string): string;
-
-        function generateAccessToken(uri: string, body?: any): string;
-
-        function isQiniuCallback(path: string, body: any, callbackAuth: any): boolean;
-    }
-    namespace zone {
-        function up_host(uptoken: string, conf: conf): void;
-    }
-    namespace rsf {
-        function listPrefix(bucket: string, prefix?: string, marker?: any, limit?: any, delimiter?: any, onret?: onret): void;
-    }
-    namespace rpc {
-        function postMultipart(uri: string, form: any, onret?: onret): any;
-
-        function postWithForm(uri: string, form: any, token?: string, onret?: onret): any;
-
-        function postWithoutForm(uri: string, token?: string, onret?: onret): any;
-    }
-    namespace fop {
-        class ImageView {
-            mode: number;
-            width: number;
-            height: number;
-            quality: number;
-            format: any;
-
-            constructor(mode?: number, width?: number, height?: number, quality?: number, format?: any);
-
-            makeRequest(url: string): string;
-        }
-
-        class ImageInfo {
-            makeRequest(url: string): string;
-        }
-        class Exif {
-            makeRequest(url: string): string;
-        }
-
-        function pfop(bucket: string, key: string, fops: any, opts?: any, onret?: onret): void;
-    }
-    namespace rs {
-        import Mac = qiniu.auth.Mac;
-        class Client {
-            client?: Client;
-
-            constructor(client?: Client);
-
-            stat(bucket: string, key: string, onret?: onret): void;
-
-            remove(bucket: string, key: string, onret?: onret): void;
-
-            move(bucketSrc: string, keySrc: string, bucketDest: string, keyDest: string, onret?: onret): void;
-
-            forceMove(bucketSrc: string, keySrc: string, bucketDest: string, keyDest: string, force: boolean, onret?: onret): void;
-
-            copy(bucketSrc: string, keySrc: string, bucketDest: string, keyDest: string, onret?: onret): void;
-
-            forceCopy(bucketSrc: string, keySrc: string, bucketDest: string, keyDest: string, force: boolean, onret?: onret): void;
-
-            fetch(url: string, bucket: string, key: string, onret?: onret): void;
-
-            batchStat(entries: any[], onret?: onret): void;
-
-            batchDelete(entries: any[], onret?: onret): void;
-
-            batchMove(entries: any[], onret?: onret): void;
-
-            forceBatchMove(entries: any[], force: boolean, onret?: onret): void;
-
-            batchCopy(entries: any[], onret?: onret): void;
-
-            forceBatchCopy(entries: any[], force: boolean, onret?: onret): void;
-        }
-        class Entry {
-            hash?: string;
-            fsize?: number;
-            putTime?: number;
-            mimeType?: string;
-            endUser?: any;
-
-            constructor(hash?: string, fsize?: number, putTime?: number, mimeType?: string, endUser?: any);
-        }
-        class EntryPath {
-            bucket?: string;
-            key?: string;
-
-            constructor(bucket?: string, key?: string);
-
-            encode(): string;
-
-            toStr(op: string): string;
-        }
-        class EntryPathPair {
-            src?: string;
-            dest?: string;
-
-            constructor(src?: string, desc?: string);
-
-            toStr(op: string, force?: boolean): string;
-        }
-        class BatchItemRet {
-            error?: any;
-            code?: number;
-
-            constructor(error?: any, code?: number);
-        }
-        class BatchStatItemRet {
-            data: any;
-            error: any;
-            code: number;
-
-            constructor(data: any, error: any, code: number);
-        }
-        class PutPolicy {
-            scope?: string;
-            callbackUrl?: string;
-            callbackBody?: any;
-            returnUrl?: string;
-            returnBody?: any;
-            endUser?: any;
-            expires: number;
-            persistentOps?: any;
-            persistentNotifyUrl?: string;
-
-            constructor(score?: string,
-                        callbackUrl?: string,
-                        callbackBody?: any,
-                        returnUrl?: string,
-                        returnBody?: any,
-                        endUser?: any,
-                        expires?: number,
-                        persistentOps?: any,
-                        persistentNotifyUrl?: string);
-
-            token(mac?: Mac): string;
-
-            getFlags(): any;
-        }
-        interface putPolicyObj {
-            scope?: string;
-            expires?: number;
-            insertOnly?: boolean;
-            saveKey?: string;
-            endUser?: any;
-            returnUrl?: string;
-            returnBody?: any;
-            callbackUrl?: string;
-            callbackHost?: string;
-            callbackBody?: any;
-            callbackBodyType?: string;
-            callbackFetchKey?: string;
-            persistentOps?: any;
-            persistentNotifyUrl?: string;
-            persistentPipeline?: string;
-            fsizeLimit?: number;
-            fsizeMin?: any;
-            detectMime?: any;
-            mimeLimit?: any;
-            deleteAfterDays?: number;
-        }
-        class PutPolicy2 {
-            scope?: string;
-            expires: number;
-            insertOnly?: boolean;
-            saveKey?: string;
-            endUser?: any;
-            returnUrl?: string;
-            returnBody?: any;
-            callbackUrl?: string;
-            callbackHost?: string;
-            callbackBody?: any;
-            callbackBodyType?: string;
-            callbackFetchKey?: string;
-            persistentOps?: any;
-            persistentNotifyUrl?: string;
-            persistentPipeline?: string;
-            fsizeLimit?: number;
-            fsizeMin?: any;
-            detectMime?: any;
-            mimeLimit?: any;
-            deleteAfterDays?: number;
-
-            constructor(putPolicyObj: putPolicyObj);
-
-            token(mac?: Mac): string;
-
-            getFlags(): any;
-        }
-        class GetPolicy {
-            expires: number;
-
-            constructor(expires?: number);
-
-            makeRequest(baseUrl: string, mac?: Mac): string;
-        }
-        function makeBaseUrl(domain: string, key: string, query?: string): string;
-    }
-}
diff --git a/types/qiniu/qiniu-tests.ts b/types/qiniu/qiniu-tests.ts
deleted file mode 100644
index ea4c3fe202..0000000000
--- a/types/qiniu/qiniu-tests.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-// test for qiniu.conf
-function testConf() {
-    qiniu.conf.ACCESS_KEY = 'Access_Key';
-    qiniu.conf.SECRET_KEY = 'Secret_Key';
-}
-
-// test for qiniu.auth
-function testAuth() {
-    // test for auth.Mac
-    const mac = new qiniu.auth.Mac(qiniu.conf.ACCESS_KEY, qiniu.conf.SECRET_KEY);
-}
-
-// test for qiniu.io
-function testIo() {
-    // test for PutExtra
-    const putExtra = new qiniu.io.PutExtra();
-    // test for PutRet
-    const putRet = new qiniu.io.PutRet();
-    // test for putReadable
-    qiniu.io.putReadable('xxx', undefined, undefined, undefined, (e?: any, result?: any, res?: any) => {
-    });
-    // test for put
-    qiniu.io.put('xxx', undefined, 'test-data', undefined, (e?: any, result?: any, res?: any) => {
-    });
-    // test for putWithoutKey
-    qiniu.io.putWithoutKey('xxx', 'test-data', undefined, (e?: any, result?: any, res?: any) => {
-    });
-    // test for putFile
-    qiniu.io.putFile('xxx', undefined, 'tslint.json', undefined, (e?: any, result?: any, res?: any) => {
-    });
-    // test for putFileWithoutKey
-    qiniu.io.putFileWithoutKey('xxx', 'tslint.json', undefined, (e?: any, result?: any, res?: any) => {
-    });
-}
-
-// test for qiniu.util
-function testUtil() {
-    // test for urlsafeBase64Encode
-    qiniu.util.urlsafeBase64Encode(null);
-    // test for base64ToUrlSafe
-    qiniu.util.base64ToUrlSafe('https://example.com');
-    // test for hmacSha1
-    qiniu.util.hmacSha1(null, 'test');
-    // test for generateAccessToken
-    qiniu.util.generateAccessToken('https://example.com');
-    // test for isQiniuCallback
-    qiniu.util.isQiniuCallback('/key', 'test-data', 'test-auth');
-}
-
-// test for qiniu.zone
-function testZone() {
-    qiniu.zone.up_host('test', {ACCESS_KEY: 'xx', SECRET_KEY: 'ss'});
-}
-
-// test for qiniu.rsf
-function testRsf() {
-    qiniu.rsf.listPrefix('test');
-}
-
-// test for qiniu.rpc
-function testRpc() {
-    // test for postMultipart
-    qiniu.rpc.postMultipart('https://up.qbox.me', 'test');
-    // test for postWithForm
-    qiniu.rpc.postWithForm('https://up.qbox.me', 'test');
-    // test for postWithoutForm
-    qiniu.rpc.postWithoutForm('https://up.qbox.me');
-}
-
-// test for qiniu.fop
-function testFop() {
-    // test for ImageView
-    const imageView = new qiniu.fop.ImageView(1, 1, 1, 1);
-    imageView.makeRequest('https://up.qbox.me');
-    // test for ImageInfo
-    const imageInfo = new qiniu.fop.ImageInfo();
-    imageInfo.makeRequest('https://up.qbox.me');
-    // test for Exif
-    const exif = new qiniu.fop.Exif();
-    exif.makeRequest('https://up.qbox.me');
-    //  test for fop
-    qiniu.fop.pfop('test', 'test', 'test');
-}
-
-// test for qiniu.rs
-function testRs() {
-    // test for Client
-    const client = new qiniu.rs.Client();
-    // test for Client.stat
-    client.stat('test', 'test', (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.remove
-    client.remove('test', 'test', (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.move
-    client.move('test-src', 'test-src', 'test-dest', 'test-dest', (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.forceMove
-    client.forceMove('test-src', 'test-src', 'test-dest', 'test-dest', true, (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.copy
-    client.copy('test-src', 'test-src', 'test-dest', 'test-dest', (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.forceCopy
-    client.forceCopy('test-src', 'test-src', 'test-dest', 'test-dest', true, (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.fetch
-    client.fetch('https://up.qbox.me', 'test', 'test', (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.batchStat
-    client.batchStat(['data'], (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.batchDelete
-    client.batchDelete(['data'], (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.batchMove
-    client.batchMove(['data'], (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.forceBatchMove
-    client.forceBatchMove(['data'], true, (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.batchCopy
-    client.batchCopy(['data'], (e?: any, result?: any, res?: any) => {
-    });
-    // test for Client.forceBatchMove
-    client.forceBatchCopy(['data'], true, (e?: any, result?: any, res?: any) => {
-    });
-    // test for Entry
-    const entry = new qiniu.rs.Entry('xx', 1, 1);
-    // test for EntryPath
-    const entryPath = new qiniu.rs.EntryPath('test', 'test');
-    entryPath.encode();
-    entryPath.toStr('x');
-    // test for EntryPathPair
-    const entryPathPair = new qiniu.rs.EntryPathPair('xxx', 'xxx');
-    entryPathPair.toStr('x', false);
-    // test for BatchItemRet
-    const batchItemRet = new qiniu.rs.BatchItemRet('xx', 0);
-    // test for BatchStatItemRet
-    const batchStatItemRet = new qiniu.rs.BatchStatItemRet('xx', 'xxx', 0);
-    // test for PutPolicy
-    const putPolicy = new qiniu.rs.PutPolicy();
-    putPolicy.token();
-    putPolicy.getFlags();
-    // test for PutPolicy2
-    const putPolicy2 = new qiniu.rs.PutPolicy2({
-        scope: 'xxx'
-    });
-    putPolicy2.token();
-    putPolicy2.getFlags();
-    // test for GetPolicy
-    const getPolicy = new qiniu.rs.GetPolicy(10);
-    getPolicy.makeRequest('https://up.qbox.me');
-    // test for makeBaseUrl
-    qiniu.rs.makeBaseUrl('up.qbox.me', 'test');
-}
diff --git a/types/qiniu/tsconfig.json b/types/qiniu/tsconfig.json
deleted file mode 100644
index d862b59b98..0000000000
--- a/types/qiniu/tsconfig.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "qiniu-tests.ts"
-    ]
-}
diff --git a/types/qiniu/tslint.json b/types/qiniu/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/qiniu/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 3b2bbebfde0285c5e1b2c6186bc31660e59406a1 Mon Sep 17 00:00:00 2001
From: Jan Wolf <mail@jan-wolf.de>
Date: Thu, 29 Jun 2017 10:15:24 +0200
Subject: [PATCH 175/287] Update index.d.ts

Adding Promise return type for email-templates
---
 types/email-templates/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/email-templates/index.d.ts b/types/email-templates/index.d.ts
index a836fdfadc..5fdd7054f3 100644
--- a/types/email-templates/index.d.ts
+++ b/types/email-templates/index.d.ts
@@ -64,6 +64,6 @@ declare module "email-templates" {
          * @param {EmailTemplateCallback|Object} locals The variables or callback function.
          * @param {EmailTemplateCallback} callback The callback function.
          */
-        render(locals: EmailTemplateCallback|Object, callback?: EmailTemplateCallback): void;
+        render(locals: EmailTemplateCallback|Object, callback?: EmailTemplateCallback): void | Promise<EmailTemplateResults>;
     }
 }

From 26a7f9af5cb14e04640c38e03e09fcc8f10ac900 Mon Sep 17 00:00:00 2001
From: lei xia <xialeistudio@gmail.com>
Date: Thu, 29 Jun 2017 16:30:48 +0800
Subject: [PATCH 176/287] Update notNeededPackages.json

---
 notNeededPackages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index d44f9a3061..4f091c05bc 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -423,7 +423,7 @@
         {
             "libraryName": "qiniu",
             "typingsPackageName": "qiniu",
-            "sourceRepoURL": "git@github.com:qiniu/nodejs-sdk.git",
+            "sourceRepoURL": "https://github.com/qiniu/nodejs-sdk,
             "asOfVersion": "6.1.0"
         },
         {

From b41d94cdd229b584982ced69ccba99cc28631a36 Mon Sep 17 00:00:00 2001
From: Roberts Slisans <rsxdalv@gmail.com>
Date: Thu, 29 Jun 2017 12:11:38 +0300
Subject: [PATCH 177/287] Fixed test case to a real world scenario, and
 subsequently fixed type definition

---
 types/mongoose-simple-random/index.d.ts                     | 6 ++++++
 .../mongoose-simple-random/mongoose-simple-random-tests.ts  | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/types/mongoose-simple-random/index.d.ts b/types/mongoose-simple-random/index.d.ts
index deed6a036f..a57f366df2 100644
--- a/types/mongoose-simple-random/index.d.ts
+++ b/types/mongoose-simple-random/index.d.ts
@@ -4,6 +4,12 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="mongoose" />
 
+declare module 'mongoose-simple-random' {
+  import mongoose = require('mongoose');
+  var _: (schema: mongoose.Schema) => void;
+  export = _;
+}
+
 declare module "mongoose" {
     interface Model<T extends Document> extends NodeJS.EventEmitter, ModelProperties {
         findRandom(conditions: Object, projection?: Object | null, options?: Object | null, callback?: (err: any, res: T[]) => void)
diff --git a/types/mongoose-simple-random/mongoose-simple-random-tests.ts b/types/mongoose-simple-random/mongoose-simple-random-tests.ts
index 2aa9e18296..f5b26dbebb 100644
--- a/types/mongoose-simple-random/mongoose-simple-random-tests.ts
+++ b/types/mongoose-simple-random/mongoose-simple-random-tests.ts
@@ -1,4 +1,5 @@
 import * as mongoose from 'mongoose';
+import * as mongoose_simple_random from "mongoose-simple-random";
 
 // test compatibility with other libraries - from @types/mongoose
 import * as _ from 'lodash';
@@ -13,3 +14,5 @@ mongoose.Model.findRandom({
 }, {}, { limit: 1 }, (error, data) => {
     if (error) { console.error("Error!"); } else { console.log("Success!"); }
 });
+
+mongoose.plugin(mongoose_simple_random);

From ee28ce2e1378d8c7031682f06a39525805ce8840 Mon Sep 17 00:00:00 2001
From: Roberts Slisans <rsxdalv@gmail.com>
Date: Thu, 29 Jun 2017 12:35:10 +0300
Subject: [PATCH 178/287] Fix tslint errors

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

diff --git a/types/mongoose-simple-random/index.d.ts b/types/mongoose-simple-random/index.d.ts
index a57f366df2..4625f582d1 100644
--- a/types/mongoose-simple-random/index.d.ts
+++ b/types/mongoose-simple-random/index.d.ts
@@ -2,12 +2,11 @@
 // Project: https://github.com/larryprice/mongoose-simple-random
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-/// <reference types="mongoose" />
 
 declare module 'mongoose-simple-random' {
   import mongoose = require('mongoose');
-  var _: (schema: mongoose.Schema) => void;
-  export = _;
+  function plugin(schema: mongoose.Schema): void;
+  export = plugin;
 }
 
 declare module "mongoose" {

From 45006ffe13c4be86f26b458fdd5f240b909e2ae5 Mon Sep 17 00:00:00 2001
From: Alex Young <alex.young@hive.hr>
Date: Thu, 29 Jun 2017 10:52:48 +0100
Subject: [PATCH 179/287] Change secretOrKey to union type of string or Buffer,
 and add relevant test.

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

diff --git a/types/passport-jwt/index.d.ts b/types/passport-jwt/index.d.ts
index bbf96be851..066921efe6 100644
--- a/types/passport-jwt/index.d.ts
+++ b/types/passport-jwt/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for passport-jwt 2.0
 // Project: https://github.com/themikenicholson/passport-jwt
 // Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+//                 Alex Young <https://github.com/alsiola/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import {Strategy as PassportStrategy} from 'passport-strategy';
@@ -12,7 +13,7 @@ export declare class Strategy extends PassportStrategy {
 }
 
 export interface StrategyOptions {
-    secretOrKey: string;
+    secretOrKey: string | Buffer;
     jwtFromRequest: JwtFromRequestFunction;
     issuer?: string;
     audience?: string;
diff --git a/types/passport-jwt/passport-jwt-tests.ts b/types/passport-jwt/passport-jwt-tests.ts
index 07b8deb1f4..1dd2baeb1e 100644
--- a/types/passport-jwt/passport-jwt-tests.ts
+++ b/types/passport-jwt/passport-jwt-tests.ts
@@ -33,5 +33,6 @@ opts.jwtFromRequest = ExtractJwt.fromUrlQueryParameter('param_name');
 opts.jwtFromRequest = ExtractJwt.fromAuthHeaderWithScheme('param_name');
 opts.jwtFromRequest = ExtractJwt.fromExtractors([ExtractJwt.fromHeader('x-api-key'), ExtractJwt.fromBodyField('field_name'), ExtractJwt.fromUrlQueryParameter('param_name')]);
 opts.jwtFromRequest = (req: Request) => { return req.query.token; };
+opts.secretOrKey = new Buffer('secret');
 
 declare function findUser(condition: {id: string}, callback: (error: any, user :any) => void): void;

From dcda58e335071d4f24e288d737802997c20eb653 Mon Sep 17 00:00:00 2001
From: Roberts Slisans <rsxdalv@gmail.com>
Date: Thu, 29 Jun 2017 13:10:22 +0300
Subject: [PATCH 180/287] Found a way.

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

diff --git a/types/mongoose-simple-random/index.d.ts b/types/mongoose-simple-random/index.d.ts
index 4625f582d1..16b1c21483 100644
--- a/types/mongoose-simple-random/index.d.ts
+++ b/types/mongoose-simple-random/index.d.ts
@@ -5,7 +5,11 @@
 
 declare module 'mongoose-simple-random' {
   import mongoose = require('mongoose');
-  function plugin(schema: mongoose.Schema): void;
+  // Dummy function allows to avoid hard to kill or fix tslint warning
+  // (exporting pluginFunc will make this a non-importable module)
+  function pluginFunc(schema: mongoose.Schema): void;
+  // Let allows typescript to still use ES2015 style imports
+  let plugin: typeof pluginFunc;
   export = plugin;
 }
 

From f2be3686d3a4a97ca9814be9bb35e11dbcb5a191 Mon Sep 17 00:00:00 2001
From: Daniel McKenzie <danm@bulb.co.uk>
Date: Thu, 29 Jun 2017 12:15:59 +0100
Subject: [PATCH 181/287] Update Auth0 typings for client credentials

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

diff --git a/types/auth0/auth0-tests.ts b/types/auth0/auth0-tests.ts
index b84e92e223..08a866e9b1 100644
--- a/types/auth0/auth0-tests.ts
+++ b/types/auth0/auth0-tests.ts
@@ -7,7 +7,8 @@ const management = new auth0.ManagementClient({
 
 const auth = new auth0.AuthenticationClient({
   domain: '{YOUR_ACCOUNT}.auth0.com',
-  clientId: '{OPTIONAL_CLIENT_ID}'
+  clientId: '{OPTIONAL_CLIENT_ID}',
+  clientSecret: '{OPTIONAL_CLIENT_SECRET}'
 });
 
 // Using a callback.
diff --git a/types/auth0/index.d.ts b/types/auth0/index.d.ts
index 3025b8d380..e9db9632d6 100644
--- a/types/auth0/index.d.ts
+++ b/types/auth0/index.d.ts
@@ -83,6 +83,7 @@ export interface Identity {
 
 export interface AuthenticationClientOptions {
   clientId?: string;
+  clientSecret?: string;
   domain: string;
 }
 
@@ -131,6 +132,16 @@ export interface ResetPasswordEmailOptions {
   connection: string;
 }
 
+export interface ClientCredentialsGrantOptions {
+  audience: string;
+}
+
+export interface PasswordGrantOptions {
+  username: string;
+  password: string;
+  realm?: string;
+}
+
 export interface ObjectWithId {
   id: string;
 }
@@ -254,8 +265,11 @@ export class AuthenticationClient {
   getProfile(accessToken: string): Promise<any>;
   getProfile(accessToken: string, cb: (err: Error, message: string) => void): void;
 
-  getCredentialsGrant(scope: string): Promise<any>;
-  getCredentialsGrant(scope: string, cb: (err: Error, message: string) => void): void;
+  clientCredentialsGrant(options: ClientCredentialsGrantOptions): Promise<any>;
+  clientCredentialsGrant(options: ClientCredentialsGrantOptions, cb: (err: Error, response: any) => void): void;
+
+  passwordGrant(options: PasswordGrantOptions): Promise<any>;
+  passwordGrant(options: PasswordGrantOptions, cb: (err: Error, response: any) => void): void;
 
 }
 

From e94d1c1c03674caf8ad29c0103cb30cce8622838 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Thu, 29 Jun 2017 14:42:29 +0300
Subject: [PATCH 182/287] React tslint errors fixed.

---
 types/react/test/index.ts | 24 ++++++++++++------------
 types/react/test/tsx.tsx  | 19 +++++++++----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 9274602c82..cb82026e96 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -34,20 +34,20 @@ interface MyComponent extends React.Component<Props, State> {
     reset(): void;
 }
 
-var props: Props & React.ClassAttributes<{}> = {
+const props: Props & React.ClassAttributes<{}> = {
     key: 42,
     ref: "myComponent42",
     hello: "world",
     foo: 42
 };
 
-var container: Element = document.createElement("div");
+const container: Element = document.createElement("div");
 
 //
 // Top-Level API
 // --------------------------------------------------------------------------
 
-var ClassicComponent: React.ClassicComponentClass<Props> =
+const ClassicComponent: React.ClassicComponentClass<Props> =
     React.createClass<Props, State>({
         displayName: "ClassicComponent",
         getDefaultProps() {
@@ -77,7 +77,6 @@ var ClassicComponent: React.ClassicComponentClass<Props> =
 
 class ModernComponent extends React.Component<Props, State>
     implements MyComponent, React.ChildContextProvider<ChildContext> {
-
     static propTypes: React.ValidationMap<Props> = {
         foo: React.PropTypes.number
     };
@@ -140,6 +139,7 @@ interface SCProps {
 function StatelessComponent(props: SCProps) {
     return props.foo ? React.DOM.div(null, props.foo) : null;
 }
+
 namespace StatelessComponent {
     export const displayName = "StatelessComponent";
     export const defaultProps = { foo: 42 };
@@ -196,18 +196,18 @@ React.cloneElement(element, {}, null);
 
 const clonedElement2: React.CElement<Props, ModernComponent> =
     // known problem: cloning with key or ref requires cast
-    React.cloneElement(element, <React.ClassAttributes<ModernComponent>> {
+    React.cloneElement(element, {
         ref: c => c && c.reset()
-    });
+    } as React.ClassAttributes<ModernComponent>);
 const clonedElement3: React.CElement<Props, ModernComponent> =
-    React.cloneElement(element, <{ foo: number } & React.Attributes> {
+    React.cloneElement(element, {
         key: "8eac7",
         foo: 55
-    });
+    } as { foo: number } & React.Attributes);
 const clonedStatelessElement: React.SFCElement<SCProps> =
     // known problem: cloning with optional props don't work properly
     // workaround: cast to actual props type
-    React.cloneElement(statelessElement, <SCProps> { foo: 44 });
+    React.cloneElement(statelessElement, { foo: 44 } as SCProps);
 const clonedClassicElement: React.ClassicElement<Props> =
     React.cloneElement(classicElement, props);
 const clonedDOMElement: React.ReactHTMLElement<HTMLDivElement> =
@@ -247,7 +247,7 @@ const key = element.key;
 // --------------------------------------------------------------------------
 
 const displayName: string | undefined = ClassicComponent.displayName;
-const defaultProps: Props = ClassicComponent.getDefaultProps ? ClassicComponent.getDefaultProps() : <Props> {};
+const defaultProps: Props = ClassicComponent.getDefaultProps ? ClassicComponent.getDefaultProps() : {} as Props;
 const propTypes: React.ValidationMap<Props> | undefined = ClassicComponent.propTypes;
 
 //
@@ -263,7 +263,7 @@ component.forceUpdate();
 const isMounted: boolean = classicComponent.isMounted();
 classicComponent.replaceState({ inputValue: "???", seconds: 60 });
 
-const myComponent = <MyComponent>component;
+const myComponent = component as MyComponent;
 myComponent.reset();
 
 //
@@ -291,7 +291,7 @@ React.DOM.div({ ref: "domRef" });
 React.DOM.div({ ref: node => domNodeRef = node });
 
 let inputNodeRef: HTMLInputElement | null;
-React.DOM.input({ ref: node => inputNodeRef = <HTMLInputElement>node });
+React.DOM.input({ ref: node => inputNodeRef = node as HTMLInputElement });
 
 //
 // Attributes
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 487700495e..dd91b5a0bd 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -3,8 +3,8 @@ import * as React from "react";
 interface SCProps {
     foo?: number;
 }
-var StatelessComponent: React.SFC<SCProps> = ({ foo }: SCProps) => {
-    return <div>{ foo }</div>;
+const StatelessComponent: React.SFC<SCProps> = ({ foo }: SCProps) => {
+    return <div>{foo}</div>;
 };
 StatelessComponent.displayName = "StatelessComponent3";
 StatelessComponent.defaultProps = {
@@ -12,8 +12,8 @@ StatelessComponent.defaultProps = {
 };
 <StatelessComponent />;
 
-var StatelessComponent2: React.SFC<SCProps> = ({ foo, children }) => {
-    return <div>{ foo }{ children }</div>;
+const StatelessComponent2: React.SFC<SCProps> = ({ foo, children }) => {
+    return <div>{foo}{children}</div>;
 };
 StatelessComponent2.displayName = "StatelessComponent4";
 StatelessComponent2.defaultProps = {
@@ -37,10 +37,9 @@ StatelessComponent2.defaultProps = {
     defaultValue="some value"
     contentEditable
     suppressContentEditableWarning
-    >
+>
     <b>foo</b>
-</div>
-
+</div>;
 
 interface Props {
     hello: string;
@@ -50,15 +49,15 @@ interface State {
 }
 class ComponentWithPropsAndState extends React.Component<Props, State> {
 }
-<ComponentWithPropsAndState hello="TypeScript" />
+<ComponentWithPropsAndState hello="TypeScript" />;
 
 class ComponentWithoutState extends React.Component<Props> {
 }
-<ComponentWithoutState hello="TypeScript" />
+<ComponentWithoutState hello="TypeScript" />;
 
 class ComponentWithoutPropsAndState extends React.Component {
 }
-<ComponentWithoutPropsAndState />
+<ComponentWithoutPropsAndState />;
 
 const StatelessComponentWithoutProps: React.SFC = (props) => {
     return <div />;

From d3901d129041e648aa82b8c929f2cc0eee3358c4 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Thu, 29 Jun 2017 15:28:23 +0300
Subject: [PATCH 183/287] Tslint disabling updated to disable only one line.

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 8800440547..baaca40308 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -26,6 +26,7 @@ type NativeTransitionEvent = TransitionEvent;
 type NativeUIEvent = UIEvent;
 type NativeWheelEvent = WheelEvent;
 
+// tslint:disable-next-line:export-just-namespace
 export = React;
 export as namespace React;
 
@@ -40,7 +41,7 @@ declare namespace React {
     type Key = string | number;
     type Ref<T> = string | ((instance: T | null) => any);
 
-    // tslint:disable:interface-over-type-literal
+    // tslint:disable-next-line:interface-over-type-literal
     type ComponentState = {};
 
     interface Attributes {
@@ -197,12 +198,12 @@ declare namespace React {
     type ReactInstance = Component<any> | Element;
 
     // Base component for plain JS classes
-    // tslint:disable:no-empty-interface
+    // tslint:disable-next-line:no-empty-interface
     interface Component<P = {}, S = {}> extends ComponentLifecycle<P, S> { }
     class Component<P, S> {
         constructor(props?: P, context?: any);
         // Disabling unified-signatures to have separate overloads. It's easier to understand this way.
-        // tslint:disable:unified-signatures
+        // tslint:disable-next-line:unified-signatures
         setState<K extends keyof S>(f: (prevState: S, props: P) => Pick<S, K>, callback?: () => any): void;
         setState<K extends keyof S>(state: Pick<S, K>, callback?: () => any): void;
         forceUpdate(callBack?: () => any): void;
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index cb82026e96..2f8d1d0de5 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -140,6 +140,7 @@ function StatelessComponent(props: SCProps) {
     return props.foo ? React.DOM.div(null, props.foo) : null;
 }
 
+// tslint:disable-next-line:no-namespace
 namespace StatelessComponent {
     export const displayName = "StatelessComponent";
     export const defaultProps = { foo: 42 };

From 9b00b35948285070099859607c7085c9e7635c6c Mon Sep 17 00:00:00 2001
From: Kamil Burek <kamil.burek@collabco.co.uk>
Date: Thu, 29 Jun 2017 13:44:14 +0100
Subject: [PATCH 184/287] TinyMCE - Add types for imagetools plugin

https://www.tinymce.com/docs/plugins/imagetools/
---
 types/tinymce/index.d.ts       | 8 ++++++++
 types/tinymce/tinymce-tests.ts | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index 59156c6c13..11196fd6e4 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -282,6 +282,14 @@ export interface Settings {
   autosave_restore_when_empty?: boolean;
 
   autosave_retention?: string;
+
+  imagetools_cors_hosts?: string[];
+
+  imagetools_proxy?: string;
+
+  imagetools_toolbar?: string;
+
+  imagetools_api_key?: string;
 }
 
 export namespace settings {
diff --git a/types/tinymce/tinymce-tests.ts b/types/tinymce/tinymce-tests.ts
index 921edffaea..2b32824349 100644
--- a/types/tinymce/tinymce-tests.ts
+++ b/types/tinymce/tinymce-tests.ts
@@ -8,7 +8,7 @@ tinymce.init({
     'advlist autolink lists link image charmap print preview anchor',
     'searchreplace visualblocks code fullscreen',
     'insertdatetime media table contextmenu paste code',
-    'autosave'
+    'autosave imagetools'
   ],
   autosave_ask_before_unload: false,
   autosave_interval: "20s",
@@ -16,7 +16,9 @@ tinymce.init({
   autosave_restore_when_empty: false,
   autosave_retention: "30m",
   toolbar: 'undo redo | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image',
-  content_css: '//www.tinymce.com/css/codepen.min.css'
+  content_css: '//www.tinymce.com/css/codepen.min.css',
+  imagetools_cors_hosts: ['mydomain.com', 'otherdomain.com'],
+  imagetools_proxy: "proxy.php"
 });
 
 const t = new tinymce.util.Color('#FFFFFF');

From 39d6470a2291efee9b25f2e043bb74ef2a621e59 Mon Sep 17 00:00:00 2001
From: Rogier Schouten <r.schouten@spiritit.com>
Date: Thu, 29 Jun 2017 15:41:29 +0200
Subject: [PATCH 185/287] add typings for license-checker

---
 types/license-checker/index.d.ts              | 87 +++++++++++++++++++
 .../license-checker/license-checker-tests.ts  | 13 +++
 types/license-checker/tsconfig.json           | 22 +++++
 types/license-checker/tslint.json             |  1 +
 4 files changed, 123 insertions(+)
 create mode 100644 types/license-checker/index.d.ts
 create mode 100644 types/license-checker/license-checker-tests.ts
 create mode 100644 types/license-checker/tsconfig.json
 create mode 100644 types/license-checker/tslint.json

diff --git a/types/license-checker/index.d.ts b/types/license-checker/index.d.ts
new file mode 100644
index 0000000000..0059c8b321
--- /dev/null
+++ b/types/license-checker/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for license-checker 11.0
+// Project: https://github.com/davglass/license-checker
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/**
+ * Options struct for the init() function
+ */
+export interface InitOpts {
+	/**
+	 * Path to start checking dependencies from
+	 */
+	start: string;
+	/**
+	 * only show production dependencies
+	 */
+	production?: boolean;
+	/**
+	 * only show development dependencies
+	 */
+	development?: boolean;
+	/**
+	 * report guessed licenses as unknown licenses
+	 */
+	unknown?: boolean;
+	/**
+	 * only list packages with unknown or guessed licenses
+	 */
+	onlyunknown?: boolean;
+	/**
+	 * to add a custom Format file in JSON
+	 */
+	customPath?: string;
+	/**
+	 * exclude modules which licenses are in the comma-separated list from the output
+	 */
+	exclude?: string[];
+	/**
+	 * Use chalk to colorize the licenses member of each returned module info. Unknown licenses become red.
+	 */
+	color?: boolean;
+	/**
+	 * output the location of the license files as relative paths
+	 */
+	relativeLicensePath?: boolean;
+}
+
+/**
+ * Information about one dependency
+ */
+export interface ModuleInfo {
+	/**
+	 * licenses, separated by ' OR '
+	 */
+	licenses: string;
+	/**
+	 * Repository URL
+	 */
+	repository: string;
+	/**
+	 * Publisher name
+	 */
+	publisher?: string;
+	/**
+	 * Publisher e-mail
+	 */
+	email?: string;
+	/**
+	 * Publisher URL
+	 */
+	url?: string;
+	/**
+	 * Path to license file, if available
+	 */
+	licenseFile?: string;
+}
+
+export interface ModuleInfos {
+	[packageName: string]: ModuleInfo;
+}
+
+/**
+ * Run the license check
+ * @param opts specifies the path to the module to check dependencies of
+ * @param callback
+ */
+export function init(opts: InitOpts, callback: (err: Error, ret: ModuleInfos) => void): void;
diff --git a/types/license-checker/license-checker-tests.ts b/types/license-checker/license-checker-tests.ts
new file mode 100644
index 0000000000..0caf98a373
--- /dev/null
+++ b/types/license-checker/license-checker-tests.ts
@@ -0,0 +1,13 @@
+// From README.md:
+
+import * as checker from 'license-checker';
+
+checker.init({
+    start: '/path/to/start/looking'
+}, (err: Error, json: checker.ModuleInfos): void => {
+    if (err) {
+        // Handle error
+    } else {
+        // The sorted json data
+    }
+});
diff --git a/types/license-checker/tsconfig.json b/types/license-checker/tsconfig.json
new file mode 100644
index 0000000000..4560756381
--- /dev/null
+++ b/types/license-checker/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",
+        "license-checker-tests.ts"
+    ]
+}
diff --git a/types/license-checker/tslint.json b/types/license-checker/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/license-checker/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4e53ae9a6b5559f3fb29219cb802eb384c090e14 Mon Sep 17 00:00:00 2001
From: Rogier Schouten <r.schouten@spiritit.com>
Date: Thu, 29 Jun 2017 16:16:49 +0200
Subject: [PATCH 186/287] bugfix: licenses member can also be a string array

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

diff --git a/types/license-checker/index.d.ts b/types/license-checker/index.d.ts
index 0059c8b321..ec4ec39658 100644
--- a/types/license-checker/index.d.ts
+++ b/types/license-checker/index.d.ts
@@ -50,9 +50,9 @@ export interface InitOpts {
  */
 export interface ModuleInfo {
 	/**
-	 * licenses, separated by ' OR '
+	 * licenses, either one string or an array of multiple licenses
 	 */
-	licenses: string;
+	licenses: string | string[];
 	/**
 	 * Repository URL
 	 */

From 1ff24425065d3f20cb2cd1afb62c5725355fc467 Mon Sep 17 00:00:00 2001
From: Artjoms Stukans <artjoms.stukans@gmail.com>
Date: Thu, 29 Jun 2017 17:40:13 +0300
Subject: [PATCH 187/287] Add missing properties for ToastrOptions

---
 types/react-redux-toastr/index.d.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index 85a7b22bc8..6579a3a903 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-redux-toastr 3.7.0
 // Project: https://github.com/diegoddox/react-redux-toastr
 // Definitions by: Aleksandar Ivanov <https://github.com/Smiche>
+//                 Artyom Stukans <https://github.com/artyomsv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -21,7 +22,11 @@ declare module "react-redux-toastr" {
          * Position of the toastr: top-left, top-center, top-right, bottom-left, bottom-center and bottom-right
          */
         position?: string,
-        confirmText?: ConfirmText
+        confirmText?: ConfirmText,
+        preventDuplicates?: boolean,
+        transitionIn?: 'bounceIn' | 'bounceInDown' | 'fadeIn',
+        transitionOut?: 'bounceOut' | 'bounceOutUp' | 'fadeOut',
+        progressBar?: boolean,
     }
 
     interface ConfirmText {

From 095c7017602242adfbb2f4851076f13b1aeb61d8 Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Thu, 29 Jun 2017 16:40:40 +0200
Subject: [PATCH 188/287] feat(dedent): add typings for `dedent`

---
 types/dedent/dedent-tests.ts | 11 +++++++++++
 types/dedent/index.d.ts      |  7 +++++++
 types/dedent/tsconfig.json   | 22 ++++++++++++++++++++++
 types/dedent/tslint.json     |  1 +
 4 files changed, 41 insertions(+)
 create mode 100644 types/dedent/dedent-tests.ts
 create mode 100644 types/dedent/index.d.ts
 create mode 100644 types/dedent/tsconfig.json
 create mode 100644 types/dedent/tslint.json

diff --git a/types/dedent/dedent-tests.ts b/types/dedent/dedent-tests.ts
new file mode 100644
index 0000000000..de2f44a920
--- /dev/null
+++ b/types/dedent/dedent-tests.ts
@@ -0,0 +1,11 @@
+import dedent from 'dedent';
+
+const lines: string = dedent`
+  first
+  second
+  third
+`;
+
+const text: string = dedent(`
+      A test argument.
+    `);
diff --git a/types/dedent/index.d.ts b/types/dedent/index.d.ts
new file mode 100644
index 0000000000..0032da4d74
--- /dev/null
+++ b/types/dedent/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for dedent v0.7.0
+// Project: https://github.com/dmnd/dedent
+// Definitions by: Douglas Duteil <https://github.com/douglasduteil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default function dedent(literals: string): string;
+export default function dedent(literals: TemplateStringsArray, ...placeholders: any[]): string;
diff --git a/types/dedent/tsconfig.json b/types/dedent/tsconfig.json
new file mode 100644
index 0000000000..29eb7040b0
--- /dev/null
+++ b/types/dedent/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",
+        "dedent-tests.ts"
+    ]
+}
diff --git a/types/dedent/tslint.json b/types/dedent/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dedent/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From fc3bbed6db011a8c5a31bd94f3099d83f5c29df7 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Thu, 29 Jun 2017 17:44:15 +0300
Subject: [PATCH 189/287] React.cloneElement overloads for ReactHTMLElement and
 SVGElement added.

---
 types/react/index.d.ts    | 25 +++++++++++++++++++------
 types/react/test/index.ts | 17 ++++++++++++++---
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index baaca40308..59c9bf733e 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -163,14 +163,21 @@ declare namespace React {
         props?: Attributes & P,
         ...children: ReactNode[]): ReactElement<P>;
 
-    function cloneElement<P extends DOMAttributes<T>, T extends Element>(
-        element: DOMElement<P, T>,
-        props?: ClassAttributes<T> & P,
-        ...children: ReactNode[]): DOMElement<P, T>;
+    // ReactHTMLElement
     function cloneElement<P extends HTMLAttributes<T>, T extends HTMLElement>(
         element: ReactHTMLElement<T>,
-        props?: ClassAttributes<T> & P,
+        props?: P,
         ...children: ReactNode[]): ReactHTMLElement<T>;
+    // SVGElement
+    function cloneElement<P extends SVGAttributes<T>, T extends SVGElement>(
+        element: ReactSVGElement,
+        props?: P,
+        ...children: ReactNode[]): ReactSVGElement;
+    // DOM Element (has to be the last, because type checking stops at first overload that fits)
+    function cloneElement<P extends DOMAttributes<T>, T extends Element>(
+        element: DOMElement<P, T>,
+        props?: DOMAttributes<T> & P,
+        ...children: ReactNode[]): DOMElement<P, T>;
     function cloneElement<P extends Q, Q>(
         element: SFCElement<P>,
         props?: Q, // should be Q & Attributes, but then Q is inferred as {}
@@ -202,10 +209,13 @@ declare namespace React {
     interface Component<P = {}, S = {}> extends ComponentLifecycle<P, S> { }
     class Component<P, S> {
         constructor(props?: P, context?: any);
+
         // Disabling unified-signatures to have separate overloads. It's easier to understand this way.
-        // tslint:disable-next-line:unified-signatures
+        // tslint:disable:unified-signatures
         setState<K extends keyof S>(f: (prevState: S, props: P) => Pick<S, K>, callback?: () => any): void;
         setState<K extends keyof S>(state: Pick<S, K>, callback?: () => any): void;
+        // tslint:enable:unified-signatures
+
         forceUpdate(callBack?: () => any): void;
         render(): JSX.Element | null | false;
 
@@ -349,6 +359,7 @@ declare namespace React {
         relatedTarget: EventTarget;
     }
 
+    // tslint:disable-next-line:no-empty-interface
     interface FormEvent<T> extends SyntheticEvent<T> {
     }
 
@@ -2941,6 +2952,7 @@ declare namespace React {
 
 declare global {
     namespace JSX {
+        // tslint:disable:no-empty-interface
         interface Element extends React.ReactElement<any> { }
         interface ElementClass extends React.Component<any> {
             render(): JSX.Element | null | false;
@@ -2950,6 +2962,7 @@ declare global {
 
         interface IntrinsicAttributes extends React.Attributes { }
         interface IntrinsicClassAttributes<T> extends React.ClassAttributes<T> { }
+        // tslint:enable:no-empty-interface
 
         interface IntrinsicElements {
             // HTML
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 2f8d1d0de5..ef3e3c6bdc 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -185,7 +185,7 @@ const element: React.CElement<Props, ModernComponent> = React.createElement(Mode
 const elementNoState: React.CElement<Props, ModernComponentNoState> = React.createElement(ModernComponentNoState, props);
 const statelessElement: React.SFCElement<SCProps> = React.createElement(StatelessComponent, props);
 const classicElement: React.ClassicElement<Props> = React.createElement(ClassicComponent, props);
-const domElement: React.ReactHTMLElement<HTMLDivElement> = React.createElement("div");
+const domElement: React.DOMElement<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> = React.createElement("div");
 const htmlElement = React.createElement("input", { type: "text" });
 const svgElement = React.createElement("svg", { accentHeight: 12 });
 
@@ -211,9 +211,20 @@ const clonedStatelessElement: React.SFCElement<SCProps> =
     React.cloneElement(statelessElement, { foo: 44 } as SCProps);
 const clonedClassicElement: React.ClassicElement<Props> =
     React.cloneElement(classicElement, props);
-const clonedDOMElement: React.ReactHTMLElement<HTMLDivElement> =
+// Clone base DOMElement
+const clonedDOMElement: React.DOMElement<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> =
     React.cloneElement(domElement, {
-        className: "clonedElement"
+        className: "clonedDOMElement"
+    });
+// Clone ReactHTMLElement
+const clonedHtmlElement: React.ReactHTMLElement<HTMLDivElement> =
+    React.cloneElement(htmlElement, {
+        className: "clonedHTMLElement"
+    });
+// Clone ReactSVGElement
+const clonedSvgElement: React.ReactSVGElement =
+    React.cloneElement(svgElement, {
+        className: "clonedVGElement"
     });
 
 // React.render

From 43cd5ade0a8927a55cc0acb1d25f4aa102118354 Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Thu, 29 Jun 2017 16:45:59 +0200
Subject: [PATCH 190/287] style(dedent): remove patch version

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

diff --git a/types/dedent/index.d.ts b/types/dedent/index.d.ts
index 0032da4d74..a6c1f198a8 100644
--- a/types/dedent/index.d.ts
+++ b/types/dedent/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for dedent v0.7.0
+// Type definitions for dedent v0.7
 // Project: https://github.com/dmnd/dedent
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 28bd33022e6c0c71f4e5d551fd0ca7c73c027b14 Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Thu, 29 Jun 2017 16:50:57 +0200
Subject: [PATCH 191/287] fix(dedent): use "import * as" notation

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

diff --git a/types/dedent/dedent-tests.ts b/types/dedent/dedent-tests.ts
index de2f44a920..30c3546066 100644
--- a/types/dedent/dedent-tests.ts
+++ b/types/dedent/dedent-tests.ts
@@ -1,4 +1,4 @@
-import dedent from 'dedent';
+import * as dedent from 'dedent';
 
 const lines: string = dedent`
   first

From cd681088d14eb55dcad4f2930ce1480c96a3f71f Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Thu, 29 Jun 2017 16:52:11 +0200
Subject: [PATCH 192/287] fix(dedent): declared as "module.exports = dedent"

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

diff --git a/types/dedent/index.d.ts b/types/dedent/index.d.ts
index a6c1f198a8..0c38da1503 100644
--- a/types/dedent/index.d.ts
+++ b/types/dedent/index.d.ts
@@ -3,5 +3,8 @@
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default function dedent(literals: string): string;
-export default function dedent(literals: TemplateStringsArray, ...placeholders: any[]): string;
+export = dedent;
+
+declare function dedent(literals: string): string;
+declare function dedent(literals: TemplateStringsArray, ...placeholders: any[]): string;
+declare namespace dedent {}

From 8d369dc81d2069c775164553d95bb01a79a8b80e Mon Sep 17 00:00:00 2001
From: Douglas Duteil <douglasduteil@gmail.com>
Date: Thu, 29 Jun 2017 16:55:02 +0200
Subject: [PATCH 193/287] style(dedent): remove extra "v" before version number

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

diff --git a/types/dedent/index.d.ts b/types/dedent/index.d.ts
index 0c38da1503..1029974a22 100644
--- a/types/dedent/index.d.ts
+++ b/types/dedent/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for dedent v0.7
+// Type definitions for dedent 0.7
 // Project: https://github.com/dmnd/dedent
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From a1b1c00e68e9648f08544ad8c0609737c7dd4c09 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Thu, 29 Jun 2017 17:58:21 +0300
Subject: [PATCH 194/287] react-burger-menu TypeScript version added.

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

diff --git a/types/react-burger-menu/index.d.ts b/types/react-burger-menu/index.d.ts
index 6d3a508c97..7368c335e2 100644
--- a/types/react-burger-menu/index.d.ts
+++ b/types/react-burger-menu/index.d.ts
@@ -2,11 +2,10 @@
 // Project: https://github.com/negomi/react-burger-menu
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
-// TODO (Rajab) actually I don't want export Props, but
-// `npm run lint react-burger-menu` error doesn't allow me to do it;
 export interface Props {
     burgerBarClassName?: string;
     burgerButtonClassName?: string;
@@ -42,9 +41,7 @@ export interface Props {
     width?: number | string;
 }
 
-// TODO (Rajab) actually I don't want export ReactBurgerMenu, but
-// `npm run lint react-burger-menu` error doesn't allow me to do it;
-export class ReactBurgerMenu extends React.Component<Props, {}> { }
+export class ReactBurgerMenu extends React.Component<Props> { }
 
 export class slide extends ReactBurgerMenu { }
 export class stack extends ReactBurgerMenu { }

From ef3404fb3b95a1e5ee689a8865c22590eaaa65f5 Mon Sep 17 00:00:00 2001
From: Artjoms Stukans <artjoms.stukans@gmail.com>
Date: Thu, 29 Jun 2017 18:13:50 +0300
Subject: [PATCH 195/287] Add missing properties for GridTile component

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

diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 16c6b5dce7..386a83c93d 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -8,6 +8,7 @@
 //                 Aurelién Allienne <https://github.com/allienna>
 //                 Matthias Schlesinger <https://github.com/schlesingermatthias>
 //                 Jonathon Kelly <https://github.com/InsidersByte>
+//                 Artyom Stukans <https://github.com/artyomsv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -1057,6 +1058,7 @@ declare namespace __MaterialUI {
             title?: React.ReactNode;
             titleBackground?: string;
             titlePosition?: "top" | "bottom";
+            titleStyle?: React.CSSProperties;
             onTouchTap?: TouchTapEventHandler;
         }
         export class GridTile extends React.Component<GridTileProps> {

From 0af3e88ce608cc33d2dec13813914e8f8c7ca475 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Thu, 29 Jun 2017 18:29:24 +0300
Subject: [PATCH 196/287] Added React.createElement overload for DOMElement.

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 59c9bf733e..1db2d243b7 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -146,6 +146,10 @@ declare namespace React {
         type: keyof ReactSVG,
         props?: ClassAttributes<T> & P,
         ...children: ReactNode[]): ReactSVGElement;
+    function createElement<P extends SVGAttributes<T>, T extends Element>(
+        type: keyof ReactSVG | keyof ReactHTML,
+        props?: ClassAttributes<T> & P,
+        ...children: ReactNode[]): DOMElement<DOMAttributes<T>, T>;
     function createElement<P>(
         type: SFC<P>,
         props?: Attributes & P,

From cb7d3e785601e2317f51c48b691e76c130813f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Helfensd=C3=B6rfer?= <tim@visualappeal.de>
Date: Thu, 29 Jun 2017 17:37:39 +0200
Subject: [PATCH 197/287] Added silent parameter for the setValue method

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

diff --git a/types/selectize/index.d.ts b/types/selectize/index.d.ts
index a9b7d77e7e..032183c630 100644
--- a/types/selectize/index.d.ts
+++ b/types/selectize/index.d.ts
@@ -543,8 +543,8 @@ declare namespace Selectize {
         /**
          * Resets the selected items to the given value(s).
          */
-        setValue(value: T): void;
-        setValue(value: T[]): void;
+        setValue(value: T, silent?: boolean): void;
+        setValue(value: T[], silent?: boolean): void;
 
         /**
          * Moves the caret to the specified position ("index" being the index in the list of selected items).

From 30bacf8be563a835f5682294eea16ac71fe4dc32 Mon Sep 17 00:00:00 2001
From: Andrew Goodale <andrewgoodale@upserve.com>
Date: Thu, 29 Jun 2017 12:04:02 -0400
Subject: [PATCH 198/287] Support arrays in style props

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 5f9e6e3856..87f3160806 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -891,7 +891,7 @@ export interface TextProperties extends TextPropertiesIOS, TextPropertiesAndroid
     /**
      * @see https://facebook.github.io/react-native/docs/text.html#style
      */
-    style?: TextStyle
+    style?: TextStyle | Array<TextStyle | undefined>
 
     /**
      * Used to locate this view in end-to-end tests.
@@ -1644,6 +1644,8 @@ export interface ViewPropertiesAndroid {
 
 }
 
+export type ViewStyleProp = ViewStyle | Array<ViewStyle | undefined>;
+
 /**
  * @see https://facebook.github.io/react-native/docs/view.html#props
  */
@@ -1671,7 +1673,6 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS
     * the Z-index of sibling views always takes precedence if a touch
     * hits two overlapping views.
     */
-
     hitSlop?: Insets
 
     /**
@@ -1724,7 +1725,7 @@ export interface ViewProperties extends ViewPropertiesAndroid, ViewPropertiesIOS
      */
     removeClippedSubviews?: boolean
 
-    style?: ViewStyle;
+    style?: ViewStyleProp;
 
     /**
      * Used to locate this view in end-to-end tests.
@@ -3376,7 +3377,7 @@ export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndr
      *
      * Style
      */
-    style?: ImageStyle;
+    style?: ImageStyle | Array<ImageStyle | undefined>;
 
     /**
      * A unique identifier for this element to be used in UI Automation testing scripts.
@@ -4283,7 +4284,7 @@ export interface TouchableWithoutFeedbackProperties extends TouchableWithoutFeed
     /**
      * //FIXME: not in doc but available in examples
      */
-    style?: ViewStyle
+    style?: ViewStyleProp
 
     /**
      * When the scroll view is disabled, this defines how far your
@@ -4341,8 +4342,7 @@ export interface TouchableHighlightProperties extends TouchableWithoutFeedbackPr
     /**
      * @see https://facebook.github.io/react-native/docs/view.html#style
      */
-    style?: ViewStyle
-
+    style?: ViewStyleProp
 
     /**
      * The color of the underlay that will show through when the touch is active.
@@ -5977,12 +5977,12 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti
      */
     onScrollBeginDrag?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void
 
-/**
+    /**
      * Fires when a user has finished scrolling.
      */
     onScrollEndDrag?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void
 
-/**
+    /**
      * Fires when scroll view has finished moving
      */
     onMomentumScrollEnd?: (event?: NativeSyntheticEvent<NativeScrollEvent>) => void
@@ -6025,7 +6025,7 @@ export interface ScrollViewProperties extends ViewProperties, ScrollViewProperti
     /**
      * Style
      */
-    style?: ScrollViewStyle
+    style?: ScrollViewStyle | Array<ScrollViewStyle | undefined>
 
     /**
      * A RefreshControl component, used to provide pull-to-refresh

From a9a6876e7b568e5d5cda37651917e3d84bb7938c Mon Sep 17 00:00:00 2001
From: Daniel McKenzie <danm@bulb.co.uk>
Date: Thu, 29 Jun 2017 17:18:51 +0100
Subject: [PATCH 199/287] Add optional provider on Auth0

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

diff --git a/types/auth0/index.d.ts b/types/auth0/index.d.ts
index e9db9632d6..4653ec901d 100644
--- a/types/auth0/index.d.ts
+++ b/types/auth0/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for auth0 3.0
+// Type definitions for auth0 4.0
 // Project: https://github.com/auth0/node-auth0
 // Definitions by: Wilson Hobbs <https://github.com/wbhob>, Seth Westphal <https://github.com/westy92>, Amiram Korach <https://github.com/amiram>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -198,7 +198,8 @@ export interface UnlinkAccountsResponse {
 
 export interface LinkAccountsData {
   user_id: string;
-  connection_id: string;
+  connection_id?: string;
+  provider?: string;
 }
 
 export interface Token {

From 5552d5d76b09e5c97dcaf1cd849fa3f64590d263 Mon Sep 17 00:00:00 2001
From: Artjoms Stukans <artjoms.stukans@gmail.com>
Date: Thu, 29 Jun 2017 19:19:43 +0300
Subject: [PATCH 200/287] Adjust existing property (confirmOptions)

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

diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index 6579a3a903..012b6eb751 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -22,14 +22,14 @@ declare module "react-redux-toastr" {
          * Position of the toastr: top-left, top-center, top-right, bottom-left, bottom-center and bottom-right
          */
         position?: string,
-        confirmText?: ConfirmText,
+        confirmOptions?: ConfirmOptions,
         preventDuplicates?: boolean,
         transitionIn?: 'bounceIn' | 'bounceInDown' | 'fadeIn',
         transitionOut?: 'bounceOut' | 'bounceOutUp' | 'fadeOut',
         progressBar?: boolean,
     }
 
-    interface ConfirmText {
+    interface ConfirmOptions {
         okText: string,
         cancelText: string
     }

From 429ff58c9e0b73bb17883c173c5fbf4a737bdaa8 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Thu, 29 Jun 2017 19:27:29 +0300
Subject: [PATCH 201/287] Added string fallback for type in ReactElement and
 DOMElement. This is needed for cusotm web-comonents.

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 29f905612b..b137832de4 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -73,7 +73,7 @@ declare namespace React {
     // ReactSVG for ReactSVGElement
     // string fallback for custom web-components
     interface DOMElement<P extends DOMAttributes<T>, T extends Element> extends ReactElement<P> {
-        type: keyof ReactHTML | keyof ReactSVG;
+        type: string | keyof ReactHTML | keyof ReactSVG;
         ref: Ref<T>;
     }
 
@@ -150,7 +150,7 @@ declare namespace React {
         props?: ClassAttributes<T> & P,
         ...children: ReactNode[]): ReactSVGElement;
     function createElement<P extends SVGAttributes<T>, T extends Element>(
-        type: keyof ReactSVG | keyof ReactHTML,
+        type: string | keyof ReactSVG | keyof ReactHTML,
         props?: ClassAttributes<T> & P,
         ...children: ReactNode[]): DOMElement<DOMAttributes<T>, T>;
     function createElement<P>(

From d370c997fa37a142492a6c83ee6d6d471cbe90a1 Mon Sep 17 00:00:00 2001
From: paranoidjk <hust2012jiangkai@gmail.com>
Date: Fri, 30 Jun 2017 00:02:07 +0800
Subject: [PATCH 202/287] fix(react-native): typo

---
 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 5f9e6e3856..8bd26696c3 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1545,7 +1545,7 @@ export interface ViewStyle extends FlexStyle, TransformsStyle {
     borderTopColor?: string;
     borderTopLeftRadius?: number;
     borderTopRightRadius?: number;
-    borderTopWidth?: number
+    borderTopWidth?: number;
     opacity?: number;
     overflow?: "visible" | "hidden"
     shadowColor?: string;

From 19b33b90d72394225f9f1d1dcbef2a68a550fa31 Mon Sep 17 00:00:00 2001
From: huhuanming <workboring@gmail.com>
Date: Fri, 30 Jun 2017 01:23:43 +0800
Subject: [PATCH 203/287] add react-native-touch-id

---
 types/react-native-touch-id/index.d.ts        | 18 +++++++++++++++
 .../react-native-touch-id-tests.ts            |  5 +++++
 types/react-native-touch-id/tsconfig.json     | 22 +++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 types/react-native-touch-id/index.d.ts
 create mode 100644 types/react-native-touch-id/react-native-touch-id-tests.ts
 create mode 100644 types/react-native-touch-id/tsconfig.json

diff --git a/types/react-native-touch-id/index.d.ts b/types/react-native-touch-id/index.d.ts
new file mode 100644
index 0000000000..04f7fbbfde
--- /dev/null
+++ b/types/react-native-touch-id/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for react-native-touch-id 3.0.0
+// Project: https://github.com/naoufal/react-native-touch-id
+// Definitions by: huhuanming <https://github.com/huhuanming>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'react-native-touch-id' {
+
+  class TouchIDError {
+    name: 'LAErrorAuthenticationFailed' | 'LAErrorUserCancel' | 'LAErrorUserFallback' | 'LAErrorSystemCancel'
+          | 'LAErrorPasscodeNotSet' | 'LAErrorTouchIDNotAvailable' | 'LAErrorTouchIDNotEnrolled'
+          | 'LAErrorTouchIDNotEnrolled' | 'RCTTouchIDUnknownError' | 'RCTTouchIDNotSupported';
+    message: string;
+    details: any;
+  }
+
+  export const isSupported: () => Promise<boolean | string>;
+  export const authenticate: (reason: string) => Promise<boolean | TouchIDError>;
+}
diff --git a/types/react-native-touch-id/react-native-touch-id-tests.ts b/types/react-native-touch-id/react-native-touch-id-tests.ts
new file mode 100644
index 0000000000..009f1c347f
--- /dev/null
+++ b/types/react-native-touch-id/react-native-touch-id-tests.ts
@@ -0,0 +1,5 @@
+import { isSupported, authenticate } from 'react-native-touch-id';
+
+isSupported().then(() => {}).catch(() => {});
+
+authenticate('reason').then(() => {}).catch(() => {});
diff --git a/types/react-native-touch-id/tsconfig.json b/types/react-native-touch-id/tsconfig.json
new file mode 100644
index 0000000000..0a1cd74c96
--- /dev/null
+++ b/types/react-native-touch-id/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-native-touch-id-tests.ts"
+    ]
+}

From 929b4a206daefb5463be587e74ea5fa225c40e90 Mon Sep 17 00:00:00 2001
From: Dovydas Navickas <dovydas@quatrodev.com>
Date: Thu, 29 Jun 2017 20:57:10 +0300
Subject: [PATCH 204/287] Fixes for comments.

---
 types/react/index.d.ts    | 29 +++++++++++++++++++++--------
 types/react/test/index.ts |  4 ++++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index b137832de4..c5742de8c7 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -52,7 +52,7 @@ declare namespace React {
     }
 
     interface ReactElement<P> {
-        type: string | keyof ReactHTML | keyof ReactSVG | ComponentClass<P> | SFC<P>;
+        type: string | ComponentClass<P> | SFC<P>;
         props: P;
         key: Key | null;
     }
@@ -69,18 +69,18 @@ declare namespace React {
 
     type ClassicElement<P> = CElement<P, ClassicComponent<P, ComponentState>>;
 
-    // ReactHTML for ReactHTMLElement
-    // ReactSVG for ReactSVGElement
     // string fallback for custom web-components
     interface DOMElement<P extends DOMAttributes<T>, T extends Element> extends ReactElement<P> {
-        type: string | keyof ReactHTML | keyof ReactSVG;
+        type: string;
         ref: Ref<T>;
     }
 
+    // ReactHTML for ReactHTMLElement
     interface ReactHTMLElement<T extends HTMLElement> extends DOMElement<HTMLAttributes<T>, T> {
         type: keyof ReactHTML;
     }
 
+    // ReactSVG for ReactSVGElement
     interface ReactSVGElement extends DOMElement<SVGAttributes<SVGElement>, SVGElement> {
         type: keyof ReactSVG;
     }
@@ -132,8 +132,15 @@ declare namespace React {
 
     function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
 
+    // DOM Elements
+    function createFactory<T extends HTMLElement>(
+        type: keyof ReactHTML): HTMLFactory<T>;
+    function createFactory(
+        type: keyof ReactSVG): SVGFactory;
     function createFactory<P extends DOMAttributes<T>, T extends Element>(
-        type: keyof ReactHTML): DOMFactory<P, T>;
+        type: string): DOMFactory<P, T>;
+
+    // Custom components
     function createFactory<P>(type: SFC<P>): SFCFactory<P>;
     function createFactory<P>(
         type: ClassType<P, ClassicComponent<P, ComponentState>, ClassicComponentClass<P>>): CFactory<P, ClassicComponent<P, ComponentState>>;
@@ -141,6 +148,7 @@ declare namespace React {
         type: ClassType<P, T, C>): CFactory<P, T>;
     function createFactory<P>(type: ComponentClass<P>): Factory<P>;
 
+    // DOM Elements
     function createElement<P extends HTMLAttributes<T>, T extends HTMLElement>(
         type: keyof ReactHTML,
         props?: ClassAttributes<T> & P,
@@ -149,10 +157,12 @@ declare namespace React {
         type: keyof ReactSVG,
         props?: ClassAttributes<T> & P,
         ...children: ReactNode[]): ReactSVGElement;
-    function createElement<P extends SVGAttributes<T>, T extends Element>(
-        type: string | keyof ReactSVG | keyof ReactHTML,
+    function createElement<P extends DOMAttributes<T>, T extends Element>(
+        type: string,
         props?: ClassAttributes<T> & P,
-        ...children: ReactNode[]): DOMElement<DOMAttributes<T>, T>;
+        ...children: ReactNode[]): DOMElement<P, T>;
+
+    // Custom components
     function createElement<P>(
         type: SFC<P>,
         props?: Attributes & P,
@@ -170,6 +180,7 @@ declare namespace React {
         props?: Attributes & P,
         ...children: ReactNode[]): ReactElement<P>;
 
+    // DOM Elements
     // ReactHTMLElement
     function cloneElement<P extends HTMLAttributes<T>, T extends HTMLElement>(
         element: ReactHTMLElement<T>,
@@ -185,6 +196,8 @@ declare namespace React {
         element: DOMElement<P, T>,
         props?: DOMAttributes<T> & P,
         ...children: ReactNode[]): DOMElement<P, T>;
+
+    // Custom components
     function cloneElement<P extends Q, Q>(
         element: SFCElement<P>,
         props?: Q, // should be Q & Attributes, but then Q is inferred as {}
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index ef3e3c6bdc..7264bfa2ea 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -189,6 +189,10 @@ const domElement: React.DOMElement<React.HTMLAttributes<HTMLDivElement>, HTMLDiv
 const htmlElement = React.createElement("input", { type: "text" });
 const svgElement = React.createElement("svg", { accentHeight: 12 });
 
+let customProps: React.HTMLProps<HTMLElement> = props;
+let customDomElement: string = "my-element";
+const nonLiteralElement = React.createElement(customDomElement, customProps);
+
 // React.cloneElement
 const clonedElement: React.CElement<Props, ModernComponent> = React.cloneElement(element, { foo: 43 });
 

From 9068107a6ac0d6d42dd9dd53afa936df5cc1756b Mon Sep 17 00:00:00 2001
From: Michiel de Bruijne <m.debruijne@matrict.nl>
Date: Thu, 29 Jun 2017 16:25:51 +0200
Subject: [PATCH 205/287] [superagent] add missing types attach method

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

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index e9b0018ed7..df3a7e709f 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -7,8 +7,9 @@
 
 /// <reference types="node" />
 
-import * as stream from 'stream';
+import * as fs from 'fs';
 import * as https from 'https';
+import * as stream from 'stream';
 
 type CallbackHandler = (err: any, res: request.Response) => void;
 
@@ -96,7 +97,7 @@ declare namespace request {
     interface Request extends Promise<Response> /* extends NodeJS.WritableStream */ {
         abort(): void;
         accept(type: string): this;
-        attach(field: string, file: string | Blob, filename?: string): this;
+        attach(field: string, file: Blob | Buffer | fs.ReadStream | string, filename?: string): this;
         auth(user: string, name: string): this;
         buffer(val?: boolean): this;
         clearTimeout(): this;

From b381c1a9baeedffba443cc518f45c6790d32dcea Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@outlook.com>
Date: Thu, 29 Jun 2017 12:39:18 -0700
Subject: [PATCH 206/287] Update notNeededPackages.json

Add trailing `"`
---
 notNeededPackages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 4f091c05bc..9eb145c9f9 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -423,7 +423,7 @@
         {
             "libraryName": "qiniu",
             "typingsPackageName": "qiniu",
-            "sourceRepoURL": "https://github.com/qiniu/nodejs-sdk,
+            "sourceRepoURL": "https://github.com/qiniu/nodejs-sdk",
             "asOfVersion": "6.1.0"
         },
         {

From 2dfa1ee22ce245bc098cc57b5fb93c336ace8978 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@outlook.com>
Date: Thu, 29 Jun 2017 12:48:45 -0700
Subject: [PATCH 207/287] Update index.d.ts

Fix version number
---
 types/auth0/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/auth0/index.d.ts b/types/auth0/index.d.ts
index 4653ec901d..07a316268a 100644
--- a/types/auth0/index.d.ts
+++ b/types/auth0/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for auth0 4.0
+// Type definitions for auth0 2.3
 // Project: https://github.com/auth0/node-auth0
 // Definitions by: Wilson Hobbs <https://github.com/wbhob>, Seth Westphal <https://github.com/westy92>, Amiram Korach <https://github.com/amiram>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From f5c35ffd35958d2715fd9446478a4071109a87b9 Mon Sep 17 00:00:00 2001
From: John Gainfort Jr <john.gainfort@realeyes.com>
Date: Thu, 29 Jun 2017 14:10:33 -0600
Subject: [PATCH 208/287] fixed extending defaultconfig property and adding
 optional properties in hls instantiation

---
 types/hls.js/hls.js-tests.ts |  28 ++-
 types/hls.js/index.d.ts      | 417 ++++++++++++++++++++++++++++++++++-
 2 files changed, 438 insertions(+), 7 deletions(-)

diff --git a/types/hls.js/hls.js-tests.ts b/types/hls.js/hls.js-tests.ts
index a8f7291044..f828f33bf5 100644
--- a/types/hls.js/hls.js-tests.ts
+++ b/types/hls.js/hls.js-tests.ts
@@ -1,8 +1,31 @@
 import * as Hls from 'hls.js';
 
+function process(playlist: string) {
+  return playlist;
+}
+
+class pLoader extends Hls.DefaultConfig.loader {
+  constructor(config: Hls.LoaderConfig) {
+    super(config);
+    const load = this.load.bind(this);
+    this.load = (context: Hls.LoaderContext, cfg: Hls.LoaderConfig, callbacks: Hls.LoaderCallbacks) => {
+      if (context.type === 'manifest') {
+        const onSuccess = callbacks.onSuccess;
+        callbacks.onSuccess = (response: Hls.LoaderResponse, stats: Hls.LoaderStats, context: Hls.LoaderContext) => {
+          response.data = process(response.data as string);
+          onSuccess(response, stats, context);
+        }
+      }
+      load(context, config, callbacks);
+    }
+  }
+}
+
 if (Hls.isSupported()) {
-  const video = <HTMLVideoElement> document.getElementById('video');
-  const hls = new Hls();
+  const video = <HTMLVideoElement>document.getElementById('video');
+  const hls = new Hls({
+    pLoader: pLoader
+  });
   const version: string = Hls.version;
   hls.loadSource('http://www.streambox.fr/playlists/test_001/stream.m3u8');
   hls.attachMedia(video);
@@ -10,3 +33,4 @@ if (Hls.isSupported()) {
     video.play();
   });
 }
+
diff --git a/types/hls.js/index.d.ts b/types/hls.js/index.d.ts
index 1911413c4f..aafddc1ffb 100644
--- a/types/hls.js/index.d.ts
+++ b/types/hls.js/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/video-dev/hls.js
 // Definitions by: John G. Gainfort, Jr. <https://github.com/jgainfort>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
 
 declare namespace Hls {
   /**
@@ -385,6 +384,410 @@ declare namespace Hls {
   const version: string;
 
   interface Config {
+    /**
+     * (default: true)
+     * if set to true, start level playlist and first fragments will be loaded automatically, after triggering of Hls.Events.MANIFEST_PARSED event
+     * if set to false, an explicit API call (hls.startLoad(startPosition=-1)) will be needed to start quality level/fragment loading.
+     */
+    autoStartLoad: boolean;
+    /**
+     * (default -1)
+     * if set to -1, playback will start from initialTime=0 for VoD and according to liveSyncDuration/liveSyncDurationCount config params for Live
+     * otherwise, playback will start from predefined value. (unless stated otherwise in autoStartLoad=false mode : in that case startPosition can be overrided using hls.startLoad(startPosition)).
+     */
+    startPosition: number;
+    /**
+     * (default: false)
+     * if set to true, the adaptive algorithm with limit levels usable in auto-quality by the HTML video element dimensions (width and height)
+     * if set to false, levels will not be limited. All available levels could be used in auto-quality mode taking only bandwidth into consideration.
+     */
+    capLevelToPlayerSize: boolean;
+    /**
+     * (default: false)
+     * setting config.debug = true; will turn on debug logs on JS console.
+     * a logger object could also be provided for custom logging: config.debug = customLogger;
+     */
+    debug: boolean;
+    /**
+     * (default: undefined)
+     * if audio codec is not signaled in variant manifest, or if only a stream manifest is provided, hls.js tries to guess audio codec by parsing audio sampling rate in ADTS header.
+     * If sampling rate is less or equal than 22050 Hz, then hls.js assumes it is HE-AAC, otherwise it assumes it is AAC-LC.
+     * This could result in bad guess, leading to audio decode error, ending up in media error.
+     * It is possible to hint default audiocodec to hls.js by configuring this value as below:
+     * mp4a.40.2 (AAC-LC) or
+     * mp4a.40.5 (HE-AAC) or
+     * undefined (guess based on sampling rate)
+     */
+    defaultAudioCodec: string;
+    /**
+     * (default: 1)
+     * number of segments needed to start a playback of Live stream.
+     */
+    initialLiveManifestSize: number;
+    /**
+     * (default: 30 seconds)
+     * Maximum buffer length in seconds. If buffer length is/become less than this value, a new fragment will be loaded.
+     * This is the guaranteed buffer length hls.js will try to reach, regardless of maxBufferSize.
+     */
+    maxBufferLength: number;
+    /**
+     * (default 600s)
+     * Maximum buffer length in seconds. Hls.js will never exceed this value, even if maxBufferSize is not reached yet.
+     * hls.js tries to buffer up to a maximum number of bytes (60 MB by default) rather than to buffer up to a maximum nb of seconds.
+     * This is to mimic the browser behaviour (the buffer eviction algorithm is starting after the browser detects that video buffer size reaches a limit in bytes)
+     * maxBufferLength is the minimum guaranteed buffer length that hls.js will try to achieve, even if that value exceeds the amount of bytes 60 MB of memory.
+     * maxMaxBufferLength acts as a capping value, as if bitrate is really low, you could need more than one hour of buffer to fill 60 MB.
+     */
+    maxMaxBufferLength: number;
+    /**
+     * (default: 60 MB)
+     * 'Minimum' maximum buffer size in bytes. If buffer size upfront is bigger than this value, no fragment will be loaded
+     */
+    maxBufferSize: number;
+    /**
+     * (default: 0.5 seconds)
+     * 'Maximum' inter-fragment buffer hole tolerance that hls.js can cope with when searching for the next fragment to load. When switching between quality level,
+     * fragments might not be perfectly aligned.
+     * This could result in small overlapping or hole in media buffer. This tolerance factor helps cope with this.
+     */
+    maxBufferHole: number;
+    /**
+     * (default: 4s)
+     *
+     * ABR algorithm will always try to choose a quality level that should avoid rebuffering. In case no quality level with this criteria can
+     * be found (lets say for example that buffer length is 1s, but fetching a fragment at lowest quality is predicted to take around 2s ...
+     * ie we can forecast around 1s of rebuffering ...) then ABR algorithm will try to find a level that should guarantee less than
+     * maxStarvationDelay of buffering.
+     */
+    maxStarvationDelay: number;
+    /**
+     * (default: 2s)
+     * In case playback is stalled, and a buffered range is available upfront, less than maxSeekHole seconds from current media position,
+     * hls.js will jump over this buffer hole to reach the beginning of this following buffered range.
+     * maxSeekHole allows to configure this jumpable threshold.
+     */
+    maxSeekHole: number;
+    /**
+     * (default: 0.5s)
+     * media element is expected to play and if currentTime has not moved for more than lowBufferWatchdogPeriod and if there are less than maxBufferHole seconds buffered upfront,
+     * hls.js will try to nudge playhead to recover playback
+     */
+    lowBufferWatchdogPeriod: number;
+    /**
+     * (default: 3s)
+     * if media element is expected to play and if currentTime has not moved for more than highBufferWatchdogPeriod and if there are more than maxBufferHole seconds buffered upfront,
+     * hls.js will try to nudge playhead to recover playback
+     */
+    highBufferWatchdogPeriod: number;
+    /**
+     * (default: 0.1s)
+     * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
+     * media.currentTime += (nb nudge retry -1)*nudgeOffset
+     */
+    nudgeOffset: number;
+    /**
+     * (default: 3s)
+     * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
+     * media.currentTime += (nb nudge retry -1)*nudgeOffset
+     */
+    nudgeMaxRetry: number;
+    /**
+     * (default 0.2s)
+     * This tolerance factor is used during fragment lookup.
+     * Instead of checking whether buffered.end is located within [start, end] range, frag lookup will be done by checking within [start-maxFragLookUpTolerance, end-maxFragLookUpTolerance] range.
+     * This tolerance factor is used to cope with situations like:
+     *      buffered.end = 9.991
+     *      frag[0] : [0,10]
+     *      frag[1] : [10,20]
+     *      buffered.end is within frag[0] range, but as we are close to frag[1], frag[1] should be choosen instead
+     * If maxFragLookUpTolerance = 0.2, this lookup will be adjusted to
+     *      frag[0] : [-0.2,9.8]
+     *      frag[1] : [9.8,19.8]
+     *  This time, buffered.end is within frag[1] range, and frag[1] will be the next fragment to be loaded, as expected
+     */
+    maxLoadingDelay: number;
+    /**
+     * (default 4s)
+     *
+     * max video loading delay used in automatic start level selection : in that mode ABR controller will ensure that video loading time (ie
+     * the time to fetch the first fragment at lowest quality level + the time to fetch the fragment at the appropriate quality level is less
+     * than maxLoadingDelay )
+     */
+    maxFragLookUpTolerance: number;
+    /**
+     * (default: 3)
+     * edge of live delay, expressed in multiple of EXT-X-TARGETDURATION. if set to 3, playback will start from fragment N-3, N being the last fragment of the live playlist.
+     * Decreasing this value is likely to cause playback stalls.
+     */
+    liveSyncDurationCount: number;
+    /**
+     * (default: undefined)
+     * Alternative parameter to liveSyncDurationCount, expressed in seconds vs number of segments.
+     * If defined in the configuration object, liveSyncDuration will take precedence over the default liveSyncDurationCount.
+     * You can't define this parameter and either liveSyncDurationCount or liveMaxLatencyDurationCount in your configuration object at the same time.
+     * A value too low (inferior to ~3 segment durations) is likely to cause playback stalls.
+     */
+    liveSyncDuration: number;
+    /**
+     * (default: Infinity)
+     * maximum delay allowed from edge of live, expressed in multiple of EXT-X-TARGETDURATION.
+     * If set to 10, the player will seek back to liveSyncDurationCount whenever the next fragment to be loaded is older than N-10, N being the last fragment of the live playlist.
+     * If set, this value must be stricly superior to liveSyncDurationCount a value too close from liveSyncDurationCount is likely to cause playback stalls.
+     */
+    liveMaxLatencyDurationCount: number;
+    /**
+     * (default: undefined)
+     * Alternative parameter to liveMaxLatencyDurationCount, expressed in seconds vs number of segments.
+     * If defined in the configuration object, liveMaxLatencyDuration will take precedence over the default liveMaxLatencyDurationCount.
+     * If set, this value must be stricly superior to liveSyncDuration which must be defined as well.
+     * You can't define this parameter and either liveSyncDurationCount or liveMaxLatencyDurationCount in your configuration object at the same time.
+     * A value too close from liveSyncDuration is likely to cause playback stalls.
+     */
+    liveMaxLatencyDuration: number;
+    /**
+     * (default: true)
+     * Enable WebWorker (if available on browser) for TS demuxing/MP4 remuxing, to improve performance and avoid lag/frame drops.
+     */
+    enableWorker: boolean;
+    /**
+     * (default: true)
+     * Enable to use JavaScript version AES decryption for fallback of WebCrypto API.
+     */
+    enableSoftwareAES: boolean;
+    /**
+     * (default: undefined)
+     * When set, use this level as the default hls.startLevel. Keep in mind that the startLevel set with the API takes precedence over
+     * config.startLevel configuration parameter.
+     */
+    startLevel: number;
+    /**
+     * (default: 10000ms for level and manifest)
+     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
+     * It is up to the application to catch this event and treat it as needed.
+     */
+    manifestLoadingTimeOut: number;
+    /**
+     * (default: 3)
+     * Max number of load retries.
+     */
+    manifestLoadingMaxRetry: number;
+    /**
+     * (default: 1000 ms)
+     * Initial delay between XMLHttpRequest error and first load retry (in ms).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Prefetch start fragment although media not attached.
+     */
+    manifestLoadingRetryDelay: number;
+    /**
+     * (default: 64000 ms)
+     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
+     */
+    manifestLoadingMaxRetryTimeout: number;
+    /**
+     * (default: 60000ms for fragment)
+     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
+     * It is up to the application to catch this event and treat it as needed.
+     */
+    levelLoadingTimeOut: number;
+    /**
+     * (default: 3)
+     * Max number of load retries.
+     */
+    levelLoadingMaxRetry: number;
+    /**
+     * (default: 1000 ms)
+     * Initial delay between XMLHttpRequest error and first load retry (in ms).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Prefetch start fragment although media not attached.
+     */
+    levelLoadingRetryDelay: number;
+    /**
+     * (default: 64000 ms)
+     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
+     */
+    levelLoadingMaxRetryTimeout: number;
+    /**
+     * (default: 60000ms for fragment)
+     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
+     * It is up to the application to catch this event and treat it as needed.
+     */
+    fragLoadingTimeOut: number;
+    /**
+     * (default: 3)
+     * Max number of load retries.
+     */
+    fragLoadingMaxRetry: number;
+    /**
+     * (default: 1000 ms)
+     * Initial delay between XMLHttpRequest error and first load retry (in ms).
+     * Any I/O error will trigger retries every 500ms,1s,2s,4s,8s, ... capped to fragLoadingMaxRetryTimeout / manifestLoadingMaxRetryTimeout / levelLoadingMaxRetryTimeout value (exponential backoff).
+     * Prefetch start fragment although media not attached.
+     */
+    fragLoadingRetryDelay: number;
+    /**
+     * (default: 64000 ms)
+     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
+     */
+    fragLoadingMaxRetryDelay: number;
+    /**
+     * (default: false)
+     * Start prefetching start fragment although media not attached yet. Max number of append retries.
+     */
+    startFragPrefech: boolean;
+    /**
+     * (default: 3)
+     * Max number of sourceBuffer.appendBuffer() retry upon error. Such error could happen in loop with UHD streams, when internal buffer is full. (Quota Exceeding Error will be triggered).
+     * In that case we need to wait for the browser to evict some data before being able to append buffer correctly.
+     */
+    appendErrorMaxRetry: number;
+    /**
+     * (default: standard XMLHttpRequest-based URL loader)
+     * Override standard URL loader by a custom one. Could be useful for P2P or stubbing (testing).
+     * Use this, if you want to overwrite both the fragment and the playlist loader.
+     * Note: If fLoader or pLoader are used, they overwrite loader!
+     */
+    loader: Loader;
+    /**
+     * (default: undefined)
+     * This enables the manipulation of the fragment loader.
+     * Note: This will overwrite the default loader, as well as your own loader function.
+     */
+    fLoader?: Loader;
+    /**
+     * (default: undefined)
+     * This enables the manipulation of the playlist loader.
+     * Note: This will overwrite the default loader, as well as your own loader function.
+     */
+    pLoader?: Loader;
+    /**
+     * (default: undefined)
+     * XMLHttpRequest customization callback for default XHR based loader.
+     * Parameter should be a function with two arguments (xhr: XMLHttpRequest, url: string).
+     * If xhrSetup is specified, default loader will invoke it before calling xhr.send(). This allows user to easily modify/setup XHR.
+     */
+    xhrSetup?(xhr: XMLHttpRequest, url: string): void;
+    /**
+     * (default: undefined)
+     * Fetch customization callback for Fetch based loader.
+     * Parameter should be a function with two arguments (context and Request Init Params).
+     * If fetchSetup is specified and Fetch loader is used, fetchSetup will be triggered to instantiate Request Object. This allows user to easily tweak Fetch loader.
+     */
+    fetchSetup?(context: any, initParams: any): Request;
+    /**
+     * (default: internal ABR controller)
+     * Customized Adaptive Bitrate Streaming Controller.
+     * Parameter should be a class providing 2 getters, 2 setters and a destroy() method:
+     * get/set nextAutoLevel: return next auto-quality level/force next auto-quality level that should be returned (currently used for emergency switch down)
+     * get/set autoLevelCapping: capping/max level value that could be used by ABR Controller
+     * destroy(): should clean-up all used resources
+     */
+    abrController: AbrController;
+    /**
+     * (default: internal track timeline controller)
+     * Customized text track syncronization controller.
+     * Parameter should be a class with a destroy() method:
+     * destroy() : should clean-up all used resources
+     */
+    timelineController: TimelineController;
+    /**
+     * (default: true)
+     * whether or not to enable CEA-708 captions
+     */
+    enableCEA708Captions: boolean;
+    /**
+     * (default: English)
+     * Label for the text track generated for CEA-708 captions track 1. This is how it will appear in the browser's native menu for subtitles and captions.
+     */
+    captionsTextTrack1Label: string;
+    /**
+     * (default: en)
+     * RFC 3066 language code for the text track generated for CEA-708 captions track 1.
+     */
+    captionsTextTrack1LanguagedCode: string;
+    /**
+     * (default: Spanish)
+     * Label for the text track generated for CEA-708 captions track 2. This is how it will appear in the browser's native menu for subtitles and captions.
+     */
+    captionsTextTrack2Label: string;
+    /**
+     * (default: es)
+     * RFC 3066 language code for the text track generated for CEA-708 captions track 2.
+     */
+    captionsTextTrack2LanguageCode: string;
+    /**
+     * (default: false)
+     * If a segment's video track is shorter than its audio track by > min(maxSeekHole, maxBufferHole), extend the final video frame's duration to match the audio track's duration.
+     * This helps playback continue in certain cases that might otherwise get stuck.
+     */
+    stretchShortVideoTrack: boolean;
+    /**
+     * (default: true)
+     * Whether or not to force having a key frame in the first AVC sample after a discontinuity.
+     * If set to true, after a discontinuity, the AVC samples without any key frame will be dropped until finding one that contains a key frame.
+     * If set to false, all AVC samples will be kept, which can help avoid holes in the stream. Setting this parameter to false can also generate decoding weirdness when switching level or seeking.
+     */
+    forceKeyFrameOnDiscontinuity: boolean;
+    /**
+     * (default: 5.0)
+     * Fast bitrate Exponential moving average half-life, used to compute average bitrate for Live streams.
+     * Half of the estimate is based on the last abrEwmaFastLive seconds of sample history. Each of the sample is weighted by the fragment loading duration.
+     * parameter should be a float greater than 0
+     */
+    abrEwmaFastLive: number;
+    /**
+     * (default: 9.0)
+     * Slow bitrate Exponential moving average half-life, used to compute average bitrate for Live streams.
+     * Half of the estimate is based on the last abrEwmaSlowLive seconds of sample history. Each of the sample is weighted by the fragment loading duration.
+     * parameter should be a float greater than abrEwmaFastLive
+     */
+    arbEwmaSlowLive: number;
+    /**
+     * (default: 4.0)
+     * Fast bitrate Exponential moving average half-life, used to compute average bitrate for VoD streams.
+     * Half of the estimate is based on the last abrEwmaFastVoD seconds of sample history. Each of the sample is weighted by the fragment loading duration.
+     * parameter should be a float greater than 0
+     */
+    arbEwmaFastVod: number;
+    /**
+     * (default: 15.0)
+     * Slow bitrate Exponential moving average half-life, used to compute average bitrate for VoD streams.
+     * Half of the estimate is based on the last abrEwmaSlowVoD seconds of sample history. Each of the sample is weighted by the fragment loading duration.
+     * parameter should be a float greater than abrEwmaFastVoD
+     */
+    arbEwmaSlowVod: number;
+    /**
+     * (default: 500000)
+     * Default bandwidth estimate in bits/second prior to collecting fragment bandwidth samples.
+     * parameter should be a float
+     */
+    arbEwmaDefaultEstimate: number;
+    /**
+     * (default: 0.8)
+     * Scale factor to be applied against measured bandwidth average, to determine whether we can stay on current or lower quality level.
+     * If abrBandWidthFactor * bandwidth average < level.bitrate then ABR can switch to that level providing that it is equal or less than current level.
+     */
+    arbBandWidthFactor: number;
+    /**
+     * (default: 0.7)
+     * Scale factor to be applied against measured bandwidth average, to determine whether we can switch up to a higher quality level.
+     * If abrBandWidthUpFactor * bandwidth average < level.bitrate then ABR can switch up to that quality level.
+     */
+    arbBandWidthUpFactor: number;
+    /**
+     * (default: false)
+     * max bitrate used in ABR by avg measured bitrate i.e. if bitrate signaled in variant manifest for a given level is 2Mb/s but average bitrate measured on this level is 2.5Mb/s,
+     * then if config value is set to true, ABR will use 2.5 Mb/s for this quality level.
+     */
+    abrMaxWithRealBitrate: boolean;
+    /**
+     * (default: 0)
+     * Return the capping/min bandwidth value that could be used by automatic level selection algorithm.
+     * Useful when browser or tab of the browser is not in the focus and bandwidth drops
+     */
+    minAutoBitrate: number;
+  }
+
+  interface OptionalConfig {
     /**
      * (default: true)
      * if set to true, start level playlist and first fragments will be loaded automatically, after triggering of Hls.Events.MANIFEST_PARSED event
@@ -647,19 +1050,19 @@ declare namespace Hls {
      * Use this, if you want to overwrite both the fragment and the playlist loader.
      * Note: If fLoader or pLoader are used, they overwrite loader!
      */
-    loader?: any;
+    loader?: Loader;
     /**
      * (default: undefined)
      * This enables the manipulation of the fragment loader.
      * Note: This will overwrite the default loader, as well as your own loader function.
      */
-    fLoader?: any;
+    fLoader?: Loader;
     /**
      * (default: undefined)
      * This enables the manipulation of the playlist loader.
      * Note: This will overwrite the default loader, as well as your own loader function.
      */
-    pLoader?: any;
+    pLoader?: Loader;
     /**
      * (default: undefined)
      * XMLHttpRequest customization callback for default XHR based loader.
@@ -1122,6 +1525,10 @@ declare namespace Hls {
   }
 
   interface Loader {
+    new (config: LoaderConfig): Loader;
+    /**
+     * Start retrieving content located at given URL (HTTP GET).
+     */
     load(context: LoaderContext, config: LoaderConfig, callbacks: LoaderCallbacks): void;
     /**
      * Abort any loading in progress.
@@ -1200,7 +1607,7 @@ declare class Hls {
   /**
    * Constructor. Can be provided an HlsConfig object as default properties and or overrides
    */
-  constructor(config?: Hls.Config)
+  constructor(config?: Hls.OptionalConfig)
   /**
    * return array of available quality levels
    */

From fb53f6e89d2a65d1eacb52f9286c91d31b336d6c Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@outlook.com>
Date: Thu, 29 Jun 2017 13:32:52 -0700
Subject: [PATCH 209/287] Update index.d.ts

fix linter issue
---
 types/wellknown/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/wellknown/index.d.ts b/types/wellknown/index.d.ts
index 41a751c2d1..0b100e5c33 100644
--- a/types/wellknown/index.d.ts
+++ b/types/wellknown/index.d.ts
@@ -3,5 +3,5 @@
 // Definitions by: Yair Tawil <https://github.com/yairtawil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export declare function parse(input: string): {};
-export declare function stringify(gj: {}): string;
+export function parse(input: string): {};
+export function stringify(gj: {}): string;

From c23fb5709f6421fe8d4fa8def4773acf6b06edad Mon Sep 17 00:00:00 2001
From: John Gainfort Jr <john.gainfort@realeyes.com>
Date: Thu, 29 Jun 2017 14:36:42 -0600
Subject: [PATCH 210/287] fixed linting errors

---
 types/hls.js/hls.js-tests.ts | 11 ++++-----
 types/hls.js/index.d.ts      | 45 ++++++++++++++++++------------------
 types/hls.js/tsconfig.json   | 42 ++++++++++++++++-----------------
 3 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/types/hls.js/hls.js-tests.ts b/types/hls.js/hls.js-tests.ts
index f828f33bf5..9af972ebcc 100644
--- a/types/hls.js/hls.js-tests.ts
+++ b/types/hls.js/hls.js-tests.ts
@@ -14,18 +14,16 @@ class pLoader extends Hls.DefaultConfig.loader {
         callbacks.onSuccess = (response: Hls.LoaderResponse, stats: Hls.LoaderStats, context: Hls.LoaderContext) => {
           response.data = process(response.data as string);
           onSuccess(response, stats, context);
-        }
+        };
       }
       load(context, config, callbacks);
-    }
+    };
   }
 }
 
 if (Hls.isSupported()) {
-  const video = <HTMLVideoElement>document.getElementById('video');
-  const hls = new Hls({
-    pLoader: pLoader
-  });
+  const video = <HTMLVideoElement> document.getElementById('video');
+  const hls = new Hls({ pLoader });
   const version: string = Hls.version;
   hls.loadSource('http://www.streambox.fr/playlists/test_001/stream.m3u8');
   hls.attachMedia(video);
@@ -33,4 +31,3 @@ if (Hls.isSupported()) {
     video.play();
   });
 }
-
diff --git a/types/hls.js/index.d.ts b/types/hls.js/index.d.ts
index aafddc1ffb..66ad839da1 100644
--- a/types/hls.js/index.d.ts
+++ b/types/hls.js/index.d.ts
@@ -2,6 +2,23 @@
 // Project: https://github.com/video-dev/hls.js
 // Definitions by: John G. Gainfort, Jr. <https://github.com/jgainfort>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare class Loader {
+  constructor(config: Hls.LoaderConfig)
+  /**
+   * Start retrieving content located at given URL (HTTP GET).
+   */
+  load(context: Hls.LoaderContext, config: Hls.LoaderConfig, callbacks: Hls.LoaderCallbacks): void;
+  /**
+   * Abort any loading in progress.
+   */
+  abort(): void;
+  /**
+   * Destroy loading context.
+   */
+  destroy(): void;
+}
 
 declare namespace Hls {
   /**
@@ -646,19 +663,19 @@ declare namespace Hls {
      * Use this, if you want to overwrite both the fragment and the playlist loader.
      * Note: If fLoader or pLoader are used, they overwrite loader!
      */
-    loader: Loader;
+    loader: typeof Loader;
     /**
      * (default: undefined)
      * This enables the manipulation of the fragment loader.
      * Note: This will overwrite the default loader, as well as your own loader function.
      */
-    fLoader?: Loader;
+    fLoader?: typeof Loader;
     /**
      * (default: undefined)
      * This enables the manipulation of the playlist loader.
      * Note: This will overwrite the default loader, as well as your own loader function.
      */
-    pLoader?: Loader;
+    pLoader?: typeof Loader;
     /**
      * (default: undefined)
      * XMLHttpRequest customization callback for default XHR based loader.
@@ -1050,19 +1067,19 @@ declare namespace Hls {
      * Use this, if you want to overwrite both the fragment and the playlist loader.
      * Note: If fLoader or pLoader are used, they overwrite loader!
      */
-    loader?: Loader;
+    loader?: typeof Loader;
     /**
      * (default: undefined)
      * This enables the manipulation of the fragment loader.
      * Note: This will overwrite the default loader, as well as your own loader function.
      */
-    fLoader?: Loader;
+    fLoader?: typeof Loader;
     /**
      * (default: undefined)
      * This enables the manipulation of the playlist loader.
      * Note: This will overwrite the default loader, as well as your own loader function.
      */
-    pLoader?: Loader;
+    pLoader?: typeof Loader;
     /**
      * (default: undefined)
      * XMLHttpRequest customization callback for default XHR based loader.
@@ -1524,22 +1541,6 @@ declare namespace Hls {
     length?: number;
   }
 
-  interface Loader {
-    new (config: LoaderConfig): Loader;
-    /**
-     * Start retrieving content located at given URL (HTTP GET).
-     */
-    load(context: LoaderContext, config: LoaderConfig, callbacks: LoaderCallbacks): void;
-    /**
-     * Abort any loading in progress.
-     */
-    abort(): void;
-    /**
-     * Destroy loading context.
-     */
-    destroy(): void;
-  }
-
   interface LoaderContext {
     /**
      * target URL
diff --git a/types/hls.js/tsconfig.json b/types/hls.js/tsconfig.json
index 6d7aab4ca9..a4131f0a47 100644
--- a/types/hls.js/tsconfig.json
+++ b/types/hls.js/tsconfig.json
@@ -1,23 +1,23 @@
 {
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "hls.js-tests.ts"
-    ]
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "dom",
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "hls.js-tests.ts"
+  ]
 }

From 29f4603830080eebc194d7e771ae6a0fb17f5886 Mon Sep 17 00:00:00 2001
From: John Gainfort Jr <john.gainfort@realeyes.com>
Date: Thu, 29 Jun 2017 14:38:27 -0600
Subject: [PATCH 211/287] removed autoformat corrections on tsconfig

---
 types/hls.js/tsconfig.json | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/types/hls.js/tsconfig.json b/types/hls.js/tsconfig.json
index a4131f0a47..9587465817 100644
--- a/types/hls.js/tsconfig.json
+++ b/types/hls.js/tsconfig.json
@@ -1,23 +1,23 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": [
-      "dom",
-      "es6"
-    ],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": true,
-    "baseUrl": "../",
-    "typeRoots": [
-      "../"
-    ],
-    "types": [],
-    "noEmit": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-    "index.d.ts",
-    "hls.js-tests.ts"
-  ]
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "dom",
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "hls.js-tests.ts"
+    ]
 }

From 35d2f4e1f11d32e4218163e6ff519f84240f56c2 Mon Sep 17 00:00:00 2001
From: John Gainfort Jr <john.gainfort@realeyes.com>
Date: Thu, 29 Jun 2017 14:40:16 -0600
Subject: [PATCH 212/287] another attempt at spacing

---
 types/hls.js/tsconfig.json | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/types/hls.js/tsconfig.json b/types/hls.js/tsconfig.json
index 9587465817..a713cb6e14 100644
--- a/types/hls.js/tsconfig.json
+++ b/types/hls.js/tsconfig.json
@@ -1,23 +1,23 @@
 {
     "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-        "dom",
-        "es6"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "baseUrl": "../",
-      "typeRoots": [
-        "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-      "index.d.ts",
-      "hls.js-tests.ts"
-    ]
+        "module": "commonjs",
+        "lib": [
+          "dom",
+          "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+      },
+      "files": [
+          "index.d.ts",
+          "hls.js-tests.ts"
+      ]
 }

From a445702a468b7296bbb5385b5148c934aa62110f Mon Sep 17 00:00:00 2001
From: John Gainfort Jr <john.gainfort@realeyes.com>
Date: Thu, 29 Jun 2017 14:41:35 -0600
Subject: [PATCH 213/287] i hate spacing

---
 types/hls.js/tsconfig.json | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/types/hls.js/tsconfig.json b/types/hls.js/tsconfig.json
index a713cb6e14..032bcfaa9d 100644
--- a/types/hls.js/tsconfig.json
+++ b/types/hls.js/tsconfig.json
@@ -1,9 +1,10 @@
 {
     "compilerOptions": {
+
         "module": "commonjs",
         "lib": [
-          "dom",
-          "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -15,9 +16,9 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
-      },
-      "files": [
-          "index.d.ts",
-          "hls.js-tests.ts"
-      ]
+    },
+    "files": [
+        "index.d.ts",
+        "hls.js-tests.ts"
+    ]
 }

From 90113bd6e34fede1b97bbf7db12b82eff717a44a Mon Sep 17 00:00:00 2001
From: John Gainfort Jr <john.gainfort@realeyes.com>
Date: Thu, 29 Jun 2017 14:42:01 -0600
Subject: [PATCH 214/287] ...

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

diff --git a/types/hls.js/tsconfig.json b/types/hls.js/tsconfig.json
index 032bcfaa9d..6d7aab4ca9 100644
--- a/types/hls.js/tsconfig.json
+++ b/types/hls.js/tsconfig.json
@@ -1,6 +1,5 @@
 {
     "compilerOptions": {
-
         "module": "commonjs",
         "lib": [
             "es6",

From 9a456fefcf08ea5b6d0284524c2e7f130180134a Mon Sep 17 00:00:00 2001
From: tsai phan <phanalpha@hotmail.com>
Date: Fri, 30 Jun 2017 12:28:18 +0800
Subject: [PATCH 215/287] [react-navigation] strictNullChecks, and tests.

---
 .../react-navigation-tests.tsx                | 31 +++++++++++++++++++
 types/react-navigation/tsconfig.json          |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 1840fd7ccf..caa8b37843 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -27,6 +27,7 @@ import {
     TabNavigatorConfig,
     Transitioner,
     addNavigationHelpers,
+    HeaderBackButton,
 } from 'react-navigation';
 
 // Constants
@@ -97,6 +98,9 @@ class NextScreen extends React.Component<NextScreenProps, {}> {
     }
 }
 
+const navigationOptions = {
+    headerBackTitle: null,
+};
 const initialRouteParams: StartScreenNavigationParams = {
     id: 1,
     s: "Start",
@@ -116,6 +120,7 @@ export const AppNavigator = StackNavigator(
     {
         initialRouteName: ROUTE_NAME_START_SCREEN,
         initialRouteParams,
+        navigationOptions,
     },
 );
 
@@ -227,6 +232,32 @@ class CustomTransitioner extends React.Component<CustomTransitionerProps, null>
     }
 }
 
+/**
+ * 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"
diff --git a/types/react-navigation/tsconfig.json b/types/react-navigation/tsconfig.json
index ad15863a78..bbf721c233 100644
--- a/types/react-navigation/tsconfig.json
+++ b/types/react-navigation/tsconfig.json
@@ -7,7 +7,7 @@
     ],
     "noImplicitAny": true,
     "noImplicitThis": true,
-    "strictNullChecks": false,
+    "strictNullChecks": true,
     "baseUrl": "../",
     "jsx": "react",
     "typeRoots": [

From aef3396e6946edd5f1cde28e25f098edcc636cf8 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Fri, 30 Jun 2017 00:40:56 -0400
Subject: [PATCH 216/287] [react-navigation] Added TabRouter

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 1d07494104..4e321e771c 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -5,6 +5,7 @@
 //                 fangpenlin <https://github.com/fangpenlin>
 //                 abrahambotros <https://github.com/abrahambotros>
 //                 petejkim <https://github.com/petejkim>
+//                 Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -633,6 +634,19 @@ export class Transitioner extends React.Component<
   TransitionerState
 > { }
 
+
+/**
+ * Tab Router
+ *
+ * @desc from react-navigation/src/routers/TabRouter.js
+ * @param routeConfigs
+ * @param config
+ */
+export function TabRouter(
+  routeConfigs: NavigationRouteConfigMap,
+  config: NavigationTabRouterConfig
+): NavigationRouter<any, any, any>
+
 /**
  * END MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
  */

From b1f0ccdf49db7e40f25f7de6f3c87777f79bd63c Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Fri, 30 Jun 2017 08:11:04 +0200
Subject: [PATCH 217/287] Change .tsconfig

---
 types/react-tag-input/tsconfig.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/types/react-tag-input/tsconfig.json b/types/react-tag-input/tsconfig.json
index 54836a10b5..78318da79d 100644
--- a/types/react-tag-input/tsconfig.json
+++ b/types/react-tag-input/tsconfig.json
@@ -2,12 +2,14 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
+        "strictNullChecks": false,
         "baseUrl": "../",
+        "jsx": "react",
         "typeRoots": [
             "../"
         ],
@@ -17,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "react-tag-input-tests.ts"
+        "react-tag-input-tests.tsx"
     ]
-}
+}
\ No newline at end of file

From 765f0726633007a2738323af7c2d233770b2c393 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Fri, 30 Jun 2017 08:20:14 +0200
Subject: [PATCH 218/287] Change filename

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

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

From 0636850adfb5732cadf8a4328c9121b1eeccda56 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Fri, 30 Jun 2017 08:26:34 +0200
Subject: [PATCH 219/287] Updated test with Array instead of []

---
 types/react-tag-input/react-tag-input-tests.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/types/react-tag-input/react-tag-input-tests.tsx b/types/react-tag-input/react-tag-input-tests.tsx
index d3e8e6fb1e..a78bced3b9 100644
--- a/types/react-tag-input/react-tag-input-tests.tsx
+++ b/types/react-tag-input/react-tag-input-tests.tsx
@@ -2,11 +2,9 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import { WithContext as ReactTags } from "react-tag-input";
 
-let tags = [
-    { id: 0, text: "test" }, { id: 1, text: "testing" }
-];
+let tags = Array({ id: 0, text: "test" }, { id: 1, text: "testing" });
 
-let suggestions = ["test", "testar"];
+let suggestions = Array("test1", "test2");
 
 ReactDOM.render(
     <ReactTags tags={tags}

From 3ad0ea6bdbd76ed4980881eb6a91ed72676060d1 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Fri, 30 Jun 2017 09:31:11 +0200
Subject: [PATCH 220/287] Updated type defenitions to use Array instead of []

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

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index 1ba112945e..2d045d5365 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -7,8 +7,8 @@
 import * as React from "react";
 
 export interface ReactTagsProps {
-    tags?: { id: number; text: string;}[];
-    suggestions?: string[];
+    tags?: Array<{id: number, text: string }>;
+    suggestions?: Array<string>;
     handleDelete: ((i: number) => void);
     handleAddition: ((tag: string) => void);
     handleDrag?: ((tag: { id: number; text: string; }, currPos: number, newPos: number) => void);

From f3c10107153c59626437bcf789315174be8e9d46 Mon Sep 17 00:00:00 2001
From: Oscar Andersson <oscar.andersson89@gmail.com>
Date: Fri, 30 Jun 2017 09:50:08 +0200
Subject: [PATCH 221/287] Changed to [] for simple type

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

diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index 2d045d5365..626b44acac 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -8,7 +8,7 @@ import * as React from "react";
 
 export interface ReactTagsProps {
     tags?: Array<{id: number, text: string }>;
-    suggestions?: Array<string>;
+    suggestions?: string[];
     handleDelete: ((i: number) => void);
     handleAddition: ((tag: string) => void);
     handleDrag?: ((tag: { id: number; text: string; }, currPos: number, newPos: number) => void);

From 8d56bf9bd9211f7869b98f77f91c0738db397bb5 Mon Sep 17 00:00:00 2001
From: e020873 <nicolas.henry-partner@arcelormittal.com>
Date: Fri, 30 Jun 2017 14:42:48 +0200
Subject: [PATCH 222/287] [send] fix for typescript 2.4.1

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

diff --git a/types/send/index.d.ts b/types/send/index.d.ts
index 4b738fa011..6c38861c4f 100644
--- a/types/send/index.d.ts
+++ b/types/send/index.d.ts
@@ -197,7 +197,7 @@ declare namespace send {
         /**
          * Pipe to `res`.
          */
-        pipe(res: stream.Writable): stream.Writable;
+        pipe<T extends NodeJS.WritableStream>(res: T): T;
 
         /**
          * Transfer `path`.

From 862cccebb38052228c1d4f2efd83ddc7e491fd39 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard-thieu@users.noreply.github.com>
Date: Fri, 30 Jun 2017 10:32:54 -0400
Subject: [PATCH 223/287] Increase nProcesses from 4 to 8. (#17656)

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

diff --git a/package.json b/package.json
index 8e734f2b89..c2fef9b679 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "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 --nProcesses 4",
+    "test": "node node_modules/types-publisher/bin/tester/test.js --run-from-definitely-typed --nProcesses 8",
     "lint": "dtslint types"
   },
   "devDependencies": {

From 0de24ae1b49f9e9d7ccc3143de2abc69e3b04065 Mon Sep 17 00:00:00 2001
From: Arturs Vonda <arturs@artursvonda.lv>
Date: Fri, 30 Jun 2017 20:32:01 +0300
Subject: [PATCH 224/287] Add new options introduced in qs 2.5

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

diff --git a/types/qs/index.d.ts b/types/qs/index.d.ts
index d3574383a5..2ecbed14be 100644
--- a/types/qs/index.d.ts
+++ b/types/qs/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for qs 6.4.0
+// Type definitions for qs 6.5.0
 // Project: https://github.com/ljharb/qs
 // Definitions by: Roman Korneev <https://github.com/RWander>
 //                 Leon Yu <https://github.com/leonyu>
 //                 Belinda Teh <https://github.com/tehbelinda>
 //                 Melvin Lee <https://github.com/zyml>
+//                 Arturs Vonda <https://github.com/artursvonda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = QueryString;
@@ -23,6 +24,7 @@ declare namespace QueryString {
         serializeDate?: (d: Date) => string;
         format?: 'RFC1738' | 'RFC3986';
         encodeValuesOnly?: boolean;
+        addQueryPrefix?: boolean;
     }
 
     interface IParseOptions {
@@ -36,6 +38,7 @@ declare namespace QueryString {
         allowPrototypes?: boolean;
         parameterLimit?: number;
         strictNullHandling?: boolean;
+        ignoreQueryPrefix?: boolean;
     }
 
     function stringify(obj: any, options?: IStringifyOptions): string;
diff --git a/types/qs/qs-tests.ts b/types/qs/qs-tests.ts
index d71aa55957..49fe89a4aa 100644
--- a/types/qs/qs-tests.ts
+++ b/types/qs/qs-tests.ts
@@ -233,6 +233,11 @@ qs.parse('a=b&c=d', { delimiter: '&' });
     assert.deepEqual(parsedStrictNull, { a: null, b: '' });
 }
 
+() => {
+    var parsedQueryPrefix = qs.parse('?a&b=', { ignoreQueryPrefix: true });
+    assert.deepEqual(parsedQueryPrefix, { a: '', b: '' });
+}
+
 () => {
     var nullsSkipped = qs.stringify({ a: 'b', c: null }, { skipNulls: true });
     assert.equal(nullsSkipped, 'a=b');
@@ -278,3 +283,7 @@ qs.parse('a=b&c=d', { delimiter: '&' });
     );
     assert.equal(encodedValues,'a=b&c[0]=d&c[1]=e%3Df&f[0][0]=g&f[1][0]=h');
 }
+
+() => {
+    assert.equal(qs.stringify({ a: 'b' }, { addQueryPrefix: true }), '?a=b');
+}

From 7ba15010a5994563d21b884a8e0078348de5255d Mon Sep 17 00:00:00 2001
From: Max Battcher <maxwell.battcher@stantec.com>
Date: Fri, 30 Jun 2017 15:15:41 -0400
Subject: [PATCH 225/287] Support Leaflet-draw explicit false options

This matches the documentation better where most of the Leaflet Draw documentation encourages to use explicit false options (rather than null), as seen in the type comments already in the typing file.
---
 types/leaflet-draw/index.d.ts            | 14 +++++++-------
 types/leaflet-draw/leaflet-draw-tests.ts | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/types/leaflet-draw/index.d.ts b/types/leaflet-draw/index.d.ts
index 22d0d45169..cf535930a6 100644
--- a/types/leaflet-draw/index.d.ts
+++ b/types/leaflet-draw/index.d.ts
@@ -40,35 +40,35 @@ declare namespace L {
 			 *
 			 *  Default value: {}
 			 */
-			polyline?: DrawOptions.PolylineOptions;
+			polyline?: DrawOptions.PolylineOptions | false;
 
 			/**
 			 * Polygon draw handler options. Set to false to disable handler.
 			 *
 			 *  Default value: {}
 			 */
-			polygon?: DrawOptions.PolygonOptions;
+			polygon?: DrawOptions.PolygonOptions | false;
 
 			/**
 			 * Rectangle draw handler options. Set to false to disable handler.
 			 *
 			 *  Default value: {}
 			 */
-			rectangle?: DrawOptions.RectangleOptions;
+			rectangle?: DrawOptions.RectangleOptions | false;
 
 			/**
 			 * Circle draw handler options. Set to false to disable handler.
 			 *
 			 *  Default value: {}
 			 */
-			circle?: DrawOptions.CircleOptions;
+			circle?: DrawOptions.CircleOptions | false;
 
 			/**
 			 * Marker draw handler options. Set to false to disable handler.
 			 *
 			 *  Default value: {}
 			 */
-			marker?: DrawOptions.MarkerOptions;
+			marker?: DrawOptions.MarkerOptions | false;
 		}
 
 		interface EditOptions {
@@ -85,14 +85,14 @@ declare namespace L {
 			 *
 			 * Default value: null
 			 */
-			edit?: DrawOptions.EditHandlerOptions;
+			edit?: DrawOptions.EditHandlerOptions | false;
 
 			/**
 			 * Delete handler options. Set to false to disable handler.
 			 *
 			 * Default value: null
 			 */
-			remove?: DrawOptions.DeleteHandlerOptions;
+			remove?: DrawOptions.DeleteHandlerOptions | false;
 		}
 
 		interface Draw extends Control {
diff --git a/types/leaflet-draw/leaflet-draw-tests.ts b/types/leaflet-draw/leaflet-draw-tests.ts
index 21c08e21e9..db6548d844 100644
--- a/types/leaflet-draw/leaflet-draw-tests.ts
+++ b/types/leaflet-draw/leaflet-draw-tests.ts
@@ -45,3 +45,27 @@ map.on(L.Draw.Event.CREATED, (e: L.DrawEvents.Created) => {
 let examplePolygon: L.LatLngLiteral[] = [{lng: 0, lat: 0}, {lng: 10, lat: 0}, {lng: 10, lat: 10}, {lng: 0, lat: 10}, {lng: 0, lat: 0}];
 let examplePolygonArea: number = L.GeometryUtil.geodesicArea(examplePolygon);
 L.GeometryUtil.readableArea(examplePolygonArea, true);
+
+function testBooleanControlOptions() {
+    const drawControl = new L.Control.Draw({
+        position: 'topleft' ,
+        draw: {
+            polygon: {
+                allowIntersection: false,
+                drawError: {
+                    color: '#b00b00',
+                    timeout: 1000
+                },
+                shapeOptions: {
+                    color: '#bada55'
+                },
+                showArea: true
+            },
+            polyline: {},
+            circle: false
+        },
+        edit: {
+            featureGroup: drawnItems
+        }
+    });
+}

From 8114855a0c77a29a3882639962ab3b4892a66e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=BAlio=20Braga?= <tuliobragam@gmail.com>
Date: Fri, 30 Jun 2017 18:13:07 -0300
Subject: [PATCH 226/287] Adding (new) optional parameters to the serializeUser
 and deserializeUser callback signature following the changes on passportjs
 lib

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

diff --git a/types/passport-local-mongoose/index.d.ts b/types/passport-local-mongoose/index.d.ts
index 8a2d036c9f..2e3377a9b8 100644
--- a/types/passport-local-mongoose/index.d.ts
+++ b/types/passport-local-mongoose/index.d.ts
@@ -19,8 +19,8 @@ declare module 'mongoose' {
   // statics
   interface PassportLocalModel<T extends Document> extends Model<T> {
     authenticate(): (username: string, password: string, cb: (err: any, res: T, error: any) => void) => void;
-    serializeUser(): (user: PassportLocalModel<T>, cb: (err: any) => void) => void;
-    deserializeUser(): (username: string, cb: (err: any) => void) => void;
+    serializeUser(): (user: PassportLocalModel<T>, cb: (err: any, id?: any) => void) => void;
+    deserializeUser(): (username: string, cb: (err: any, user?: any) => void) => void;
     register(user: T, password: string, cb: (err: any, account: any) => void): void;
     findByUsername(username: string, selectHashSaltFields: boolean, cb: (err: any, account: any) => void): any;
     createStrategy(): passportLocal.Strategy;

From 97623535569c9c5c957a9ff2c1b99179499e601f Mon Sep 17 00:00:00 2001
From: StickerFiend <matt@carstickers.com>
Date: Fri, 30 Jun 2017 14:20:56 -0700
Subject: [PATCH 227/287] Added hex string option to Color constructor

Passing a string into Color worked prior to Typescript 2.4

Requires @clark-stevenson approval.
---
 types/paper/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index 197707058b..918603be84 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -3514,6 +3514,12 @@ declare module 'paper' {
          * @param highlight [optional] -
          */
         constructor(color: Gradient, origin: Point, destination: Point, highlight?: Point);
+        
+        /**
+         * Creates a RGB Color object.
+         * @param hex - the RGB color in hex, i.e. #000000
+         */
+        constructor(hex: string);
 
         /**
          * The type of the color as a string.

From 8b1f037c8ff2a3d2fb41af29b1a6df96030322d6 Mon Sep 17 00:00:00 2001
From: Mattoni <amattoni@petrichor.io>
Date: Fri, 30 Jun 2017 14:46:31 -0700
Subject: [PATCH 228/287] Update rc-slider definitions to 8.1

---
 types/rc-slider/index.d.ts          | 51 ++++++++++++++++++-----------
 types/rc-slider/rc-slider-tests.tsx |  3 +-
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index 34cfc22056..cc25d67b40 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -1,17 +1,20 @@
-// Type definitions for rc-slider 6.1
+// Type definitions for rc-slider 8.1
 // Project: https://github.com/react-component/slider
-// Definitions by: Marcinkus Mantas <https://github.com/mantasmarcinkus/>
+// Definitions by: Marcinkus Mantas <https://github.com/mantasmarcinkus/>, Alexander Mattoni <https://github.com/mattoni/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import * as React from 'react';
+declare module "rc-slider" {
+    import * as React from "react";
 
-declare namespace RcSliderClass {
-    interface Marks {
-        [number: number]: JSX.Element | string | { style: any, label: string | JSX.Element };
+    export interface Marks {
+        [number: number]:
+            | JSX.Element
+            | string
+            | { style: any; label: string | JSX.Element };
     }
 
-    interface CommonApiProps {
+    export interface CommonApiProps {
         /**
          * Additional CSS class for the root DOM node
          *  @default ''
@@ -86,9 +89,24 @@ declare namespace RcSliderClass {
          * Tooltip formatter
          */
         tipFormatter?: ((value: any) => any | undefined) | null;
+
+        /**
+         * The style used for handle. (both for slider(Object) and range(Array of Object), the array will be used for mutli handle follow element order)
+         */
+        handleStyle?: Array<React.CSSProperties> | React.CSSProperties;
+
+        /**
+         * The style used for track. (both for slider(Object) and range(Array of Object), the array will be used for mutli track follow element order)
+         */
+        trackStyle?: Array<React.CSSProperties> | React.CSSProperties;
+
+        /**
+          * The style used for the track base color.
+          */
+        railStyle?: React.CSSProperties;
     }
 
-    interface SliderProps extends CommonApiProps {
+    export interface SliderProps extends CommonApiProps {
         /**
          * Set initial value of slider.
          *  @default 0
@@ -100,7 +118,7 @@ declare namespace RcSliderClass {
         value?: number;
     }
 
-    interface RangeProps extends CommonApiProps {
+    export interface RangeProps extends CommonApiProps {
         /**
          * Set initial positions of handles.
          *  @default [0,0]
@@ -127,7 +145,7 @@ declare namespace RcSliderClass {
         pushable?: boolean;
     }
 
-    interface HandleProps extends CommonApiProps {
+    export interface HandleProps extends CommonApiProps {
         /**
          * Class name
          */
@@ -142,13 +160,8 @@ declare namespace RcSliderClass {
          */
         offset: number;
     }
+
+    export default class Slider extends React.Component<SliderProps> {}
+    export class Range extends React.Component<RangeProps> {}
+    export class Handle extends React.Component<HandleProps> {}
 }
-
-declare class RcSliderClass extends React.Component<RcSliderClass.SliderProps> { }
-
-declare namespace RcSliderClass {
-    class Range extends React.Component<RcSliderClass.RangeProps> { }
-    class Handle extends React.Component<RcSliderClass.HandleProps> { }
-}
-
-export = RcSliderClass;
diff --git a/types/rc-slider/rc-slider-tests.tsx b/types/rc-slider/rc-slider-tests.tsx
index 55c0674741..7e2e14e317 100644
--- a/types/rc-slider/rc-slider-tests.tsx
+++ b/types/rc-slider/rc-slider-tests.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import * as Slider from 'rc-slider';
-import { Range, Handle } from 'rc-slider';
+import Slider, { Range, Handle } from 'rc-slider';
 
 ReactDOM.render(
     <Slider defaultValue={1} max={2} step={0.01} min={0.01} />,

From 1773771f098f35a27ca0ffeaacb9f8e8f5fe4012 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Fri, 30 Jun 2017 14:50:21 -0700
Subject: [PATCH 229/287] qiniu: asOfVersion must be greater than last
 published version (#17667)

---
 notNeededPackages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 3b3c3f8ea1..50d71d2165 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -430,7 +430,7 @@
             "libraryName": "qiniu",
             "typingsPackageName": "qiniu",
             "sourceRepoURL": "https://github.com/qiniu/nodejs-sdk",
-            "asOfVersion": "6.1.0"
+            "asOfVersion": "7.0.1"
         },
         {
             "libraryName": "Raven JS",

From ee24cde3466d3c68f90d501e62ba4cae91c79099 Mon Sep 17 00:00:00 2001
From: Mattoni <amattoni@petrichor.io>
Date: Fri, 30 Jun 2017 14:52:22 -0700
Subject: [PATCH 230/287] Update rc-slider definitions to 8.1

---
 types/rc-slider/index.d.ts | 316 ++++++++++++++++++-------------------
 1 file changed, 157 insertions(+), 159 deletions(-)

diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index cc25d67b40..e17504fecf 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -4,164 +4,162 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-declare module "rc-slider" {
-    import * as React from "react";
+import * as React from "react";
 
-    export interface Marks {
-        [number: number]:
-            | JSX.Element
-            | string
-            | { style: any; label: string | JSX.Element };
-    }
-
-    export interface CommonApiProps {
-        /**
-         * Additional CSS class for the root DOM node
-         *  @default ''
-         */
-        className?: string;
-        /**
-         * The minimum value of the slider
-         *  @default 0
-         */
-        min?: number;
-        /**
-         * The maximum value of the slider
-         *  @default 100
-         */
-        max?: number;
-        /**
-         * Marks on the slider. The key determines the position, and the value determines what will show.
-         * If you want to set the style of a specific mark point, the value should be an object which contains style and label properties.
-         *  @default '{}' | {number: { style, label }}
-         */
-        marks?: Marks;
-        /**
-         * Value to be added or subtracted on each step the slider makes. Must be greater than zero, and max - min should be evenly divisible by the step value.
-         *  @default 1
-         */
-        step?: number;
-        /**
-         * If vertical is true, the slider will be vertical.
-         * @default false
-         */
-        vertical?: boolean;
-        /**
-         * A handle generator which could be used to customized handle.
-         */
-        handle?(props: any): React.ReactNode;
-        /**
-         * If the value is true, it means a continuous value interval, otherwise, it is a independent value.
-         *  @default true
-         */
-        included?: boolean;
-        /**
-         * If true, handles can't be moved.
-         *  @default false
-         */
-        disabled?: boolean;
-        /**
-         * When the step value is greater than 1, you can set the dots to true if you want to render the slider with dots.
-         *  @default false
-         */
-        dots?: boolean;
-        /**
-         * onBeforeChange will be triggered when ontouchstart or onmousedown is triggered.
-         */
-        onBeforeChange?(value: any): any | undefined;
-        /**
-         * onChange will be triggered while the value of Slider changing.
-         */
-        onChange?(value: any): any | undefined;
-        /**
-         * onAfterChange will be triggered when ontouchend or onmouseup is triggered.
-         */
-        onAfterChange?(value: any): any | undefined;
-
-        /**
-         * @deprecated in version ^6.0.0. Use rc-tooltip
-         * Tooltip transition class name
-         */
-        tipTransitionName?: string;
-
-        /**
-         * @deprecated in version ^6.0.0. Use rc-tooltip
-         * Tooltip formatter
-         */
-        tipFormatter?: ((value: any) => any | undefined) | null;
-
-        /**
-         * The style used for handle. (both for slider(Object) and range(Array of Object), the array will be used for mutli handle follow element order)
-         */
-        handleStyle?: Array<React.CSSProperties> | React.CSSProperties;
-
-        /**
-         * The style used for track. (both for slider(Object) and range(Array of Object), the array will be used for mutli track follow element order)
-         */
-        trackStyle?: Array<React.CSSProperties> | React.CSSProperties;
-
-        /**
-          * The style used for the track base color.
-          */
-        railStyle?: React.CSSProperties;
-    }
-
-    export interface SliderProps extends CommonApiProps {
-        /**
-         * Set initial value of slider.
-         *  @default 0
-         */
-        defaultValue?: number;
-        /**
-         * Set current value of slider.
-         */
-        value?: number;
-    }
-
-    export interface RangeProps extends CommonApiProps {
-        /**
-         * Set initial positions of handles.
-         *  @default [0,0]
-         */
-        defaultValue?: number[];
-        /**
-         * Set current positions of handles.
-         */
-        value?: number[];
-        /**
-         * Determine how many ranges to render, and multiple handles will be rendered (number + 1).
-         *  @default 1
-         */
-        count?: number;
-        /**
-         * allowCross could be set as true to allow those handles to cross.
-         *  @default true
-         */
-        allowCross?: boolean;
-        /**
-         * pushable could be set as true to allow pushing of surrounding handles when moving an handle. When set to a number, the number will be the minimum ensured distance between handles.
-         *  @default true
-         */
-        pushable?: boolean;
-    }
-
-    export interface HandleProps extends CommonApiProps {
-        /**
-         * Class name
-         */
-        className: string;
-        /**
-         * Styling if true, then bottom: {offset} else left: {offset}
-         * @default False
-         */
-        vertical: boolean;
-        /**
-         * Styling option offset
-         */
-        offset: number;
-    }
-
-    export default class Slider extends React.Component<SliderProps> {}
-    export class Range extends React.Component<RangeProps> {}
-    export class Handle extends React.Component<HandleProps> {}
+export interface Marks {
+    [number: number]:
+    | JSX.Element
+    | string
+    | { style: any; label: string | JSX.Element };
 }
+
+export interface CommonApiProps {
+    /**
+     * Additional CSS class for the root DOM node
+     *  @default ''
+     */
+    className?: string;
+    /**
+     * The minimum value of the slider
+     *  @default 0
+     */
+    min?: number;
+    /**
+     * The maximum value of the slider
+     *  @default 100
+     */
+    max?: number;
+    /**
+     * Marks on the slider. The key determines the position, and the value determines what will show.
+     * If you want to set the style of a specific mark point, the value should be an object which contains style and label properties.
+     *  @default '{}' | {number: { style, label }}
+     */
+    marks?: Marks;
+    /**
+     * Value to be added or subtracted on each step the slider makes. Must be greater than zero, and max - min should be evenly divisible by the step value.
+     *  @default 1
+     */
+    step?: number;
+    /**
+     * If vertical is true, the slider will be vertical.
+     * @default false
+     */
+    vertical?: boolean;
+    /**
+     * A handle generator which could be used to customized handle.
+     */
+    handle?(props: any): React.ReactNode;
+    /**
+     * If the value is true, it means a continuous value interval, otherwise, it is a independent value.
+     *  @default true
+     */
+    included?: boolean;
+    /**
+     * If true, handles can't be moved.
+     *  @default false
+     */
+    disabled?: boolean;
+    /**
+     * When the step value is greater than 1, you can set the dots to true if you want to render the slider with dots.
+     *  @default false
+     */
+    dots?: boolean;
+    /**
+     * onBeforeChange will be triggered when ontouchstart or onmousedown is triggered.
+     */
+    onBeforeChange?(value: any): any | undefined;
+    /**
+     * onChange will be triggered while the value of Slider changing.
+     */
+    onChange?(value: any): any | undefined;
+    /**
+     * onAfterChange will be triggered when ontouchend or onmouseup is triggered.
+     */
+    onAfterChange?(value: any): any | undefined;
+
+    /**
+     * @deprecated in version ^6.0.0. Use rc-tooltip
+     * Tooltip transition class name
+     */
+    tipTransitionName?: string;
+
+    /**
+     * @deprecated in version ^6.0.0. Use rc-tooltip
+     * Tooltip formatter
+     */
+    tipFormatter?: ((value: any) => any | undefined) | null;
+
+    /**
+     * The style used for handle. (both for slider(Object) and range(Array of Object), the array will be used for mutli handle follow element order)
+     */
+    handleStyle?: Array<React.CSSProperties> | React.CSSProperties;
+
+    /**
+     * The style used for track. (both for slider(Object) and range(Array of Object), the array will be used for mutli track follow element order)
+     */
+    trackStyle?: Array<React.CSSProperties> | React.CSSProperties;
+
+    /**
+      * The style used for the track base color.
+      */
+    railStyle?: React.CSSProperties;
+}
+
+export interface SliderProps extends CommonApiProps {
+    /**
+     * Set initial value of slider.
+     *  @default 0
+     */
+    defaultValue?: number;
+    /**
+     * Set current value of slider.
+     */
+    value?: number;
+}
+
+export interface RangeProps extends CommonApiProps {
+    /**
+     * Set initial positions of handles.
+     *  @default [0,0]
+     */
+    defaultValue?: number[];
+    /**
+     * Set current positions of handles.
+     */
+    value?: number[];
+    /**
+     * Determine how many ranges to render, and multiple handles will be rendered (number + 1).
+     *  @default 1
+     */
+    count?: number;
+    /**
+     * allowCross could be set as true to allow those handles to cross.
+     *  @default true
+     */
+    allowCross?: boolean;
+    /**
+     * pushable could be set as true to allow pushing of surrounding handles when moving an handle. When set to a number, the number will be the minimum ensured distance between handles.
+     *  @default true
+     */
+    pushable?: boolean;
+}
+
+export interface HandleProps extends CommonApiProps {
+    /**
+     * Class name
+     */
+    className: string;
+    /**
+     * Styling if true, then bottom: {offset} else left: {offset}
+     * @default False
+     */
+    vertical: boolean;
+    /**
+     * Styling option offset
+     */
+    offset: number;
+}
+
+export default class Slider extends React.Component<SliderProps> { }
+export class Range extends React.Component<RangeProps> { }
+export class Handle extends React.Component<HandleProps> { }

From 7d8db5784b340bbf7c0ac97aa1f76b99a9ca2359 Mon Sep 17 00:00:00 2001
From: Mattoni <amattoni@petrichor.io>
Date: Fri, 30 Jun 2017 14:58:30 -0700
Subject: [PATCH 231/287] lint file

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

diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index e17504fecf..c30f6a649c 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -92,16 +92,16 @@ export interface CommonApiProps {
     /**
      * The style used for handle. (both for slider(Object) and range(Array of Object), the array will be used for mutli handle follow element order)
      */
-    handleStyle?: Array<React.CSSProperties> | React.CSSProperties;
+    handleStyle?: React.CSSProperties[] | React.CSSProperties;
 
     /**
      * The style used for track. (both for slider(Object) and range(Array of Object), the array will be used for mutli track follow element order)
      */
-    trackStyle?: Array<React.CSSProperties> | React.CSSProperties;
+    trackStyle?: React.CSSProperties[] | React.CSSProperties;
 
     /**
-      * The style used for the track base color.
-      */
+     * The style used for the track base color.
+     */
     railStyle?: React.CSSProperties;
 }
 

From df59d9f5b956d2ed2aa36e4d2c081f6567143b54 Mon Sep 17 00:00:00 2001
From: kimu_shu <alfvegardrisc@gmail.com>
Date: Sat, 1 Jul 2017 12:23:19 +0900
Subject: [PATCH 232/287] Accept PromiseLike object

---
 types/promise.prototype.finally/index.d.ts                      | 2 +-
 .../promise.prototype.finally-tests.ts                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/promise.prototype.finally/index.d.ts b/types/promise.prototype.finally/index.d.ts
index 9df993ce93..cc50669344 100644
--- a/types/promise.prototype.finally/index.d.ts
+++ b/types/promise.prototype.finally/index.d.ts
@@ -5,7 +5,7 @@
 
 declare global {
     interface Promise<T> {
-        finally<U>(onFinally?: () => U | Promise<U>): Promise<T>;
+        finally<U>(onFinally?: () => U | PromiseLike<U>): Promise<T>;
     }
 }
 
diff --git a/types/promise.prototype.finally/promise.prototype.finally-tests.ts b/types/promise.prototype.finally/promise.prototype.finally-tests.ts
index b7f5848606..b28a64b10d 100644
--- a/types/promise.prototype.finally/promise.prototype.finally-tests.ts
+++ b/types/promise.prototype.finally/promise.prototype.finally-tests.ts
@@ -7,6 +7,7 @@ var promise = new Promise<Boolean>((resolve, reject) => {
 });
 
 promise.finally(() => {});
+promise.finally(() => <PromiseLike<void>>Promise.resolve());
 promise.then(() => {}, () => {}).finally(() => {});
 promise.catch(() => {}).finally(() => {});
 

From fb96955d50672f3639e151ff36e87a37e2e774e3 Mon Sep 17 00:00:00 2001
From: kimu_shu <alfvegardrisc@gmail.com>
Date: Sat, 1 Jul 2017 12:34:00 +0900
Subject: [PATCH 233/287] Add tslint.json and fix lint errors

---
 types/promise.prototype.finally/index.d.ts                  | 2 +-
 .../promise.prototype.finally-tests.ts                      | 6 +++---
 types/promise.prototype.finally/tslint.json                 | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 types/promise.prototype.finally/tslint.json

diff --git a/types/promise.prototype.finally/index.d.ts b/types/promise.prototype.finally/index.d.ts
index cc50669344..5c4581ba46 100644
--- a/types/promise.prototype.finally/index.d.ts
+++ b/types/promise.prototype.finally/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for promise.prototype.finally v2.0.1
+// Type definitions for promise.prototype.finally 2.0
 // Project: https://github.com/matthew-andrews/Promise.prototype.finally
 // Definitions by: Slava Shpitalny <https://github.com/slavik57>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/promise.prototype.finally/promise.prototype.finally-tests.ts b/types/promise.prototype.finally/promise.prototype.finally-tests.ts
index b28a64b10d..2fa7c96512 100644
--- a/types/promise.prototype.finally/promise.prototype.finally-tests.ts
+++ b/types/promise.prototype.finally/promise.prototype.finally-tests.ts
@@ -2,14 +2,14 @@ import promiseFinally = require('promise.prototype.finally');
 
 promiseFinally.shim();
 
-var promise = new Promise<Boolean>((resolve, reject) => {
+let promise = new Promise<boolean>((resolve, reject) => {
 	resolve(true);
 });
 
 promise.finally(() => {});
-promise.finally(() => <PromiseLike<void>>Promise.resolve());
+promise.finally(() => <PromiseLike<void>> Promise.resolve());
 promise.then(() => {}, () => {}).finally(() => {});
 promise.catch(() => {}).finally(() => {});
 
-var allPromise = Promise.all([promise]);
+let allPromise = Promise.all([promise]);
 allPromise.finally(() => {});
diff --git a/types/promise.prototype.finally/tslint.json b/types/promise.prototype.finally/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/promise.prototype.finally/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From acfeaa6869b8e03563d0d74b07b0192210227bc7 Mon Sep 17 00:00:00 2001
From: Ed Bassett <ed.a.bassett@gmail.com>
Date: Sat, 1 Jul 2017 15:25:52 +1000
Subject: [PATCH 234/287] Fix Easing interface, elastic should be a function

As described in the docs, `elastic` should take a value representing the bounciness of the easing function:
https://facebook.github.io/react-native/docs/easing.html
---
 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 17e15ae698..e1cc0daa3c 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -7708,7 +7708,7 @@ export interface EasingStatic {
     sin: EasingFunction;
     circle: EasingFunction;
     exp: EasingFunction;
-    elastic: EasingFunction;
+    elastic(bounciness: number): EasingFunction;
     back(s: number): EasingFunction;
     bounce: EasingFunction;
     bezier(x1: number,

From 93acafe448df680873c6123e54b43c4685c2f631 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Sat, 1 Jul 2017 07:37:45 -0400
Subject: [PATCH 235/287] [react-navigation] Added StackRouter

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 4e321e771c..6b821586dd 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -647,6 +647,17 @@ export function TabRouter(
   config: NavigationTabRouterConfig
 ): NavigationRouter<any, any, any>
 
+/**
+ * Stack Router
+ *
+ * @desc from react-navigation/src/routers/StackRouter.js
+ * @param routeConfigs
+ * @param config
+ */
+export function StackRouter(
+  routeConfigs: NavigationRouteConfigMap,
+  config: NavigationTabRouterConfig
+): NavigationRouter<any, any, any>
 /**
  * END MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
  */

From 70ba063fd3d67987686c447204a1abd377318570 Mon Sep 17 00:00:00 2001
From: Jason Wu <jason.a.wu@accenture.com>
Date: Sat, 1 Jul 2017 12:11:52 -0500
Subject: [PATCH 236/287] Added type definitions for draggabilly

---
 types/draggabilly/draggabilly-tests.ts | 46 ++++++++++++++++++++++++++
 types/draggabilly/index.d.ts           | 42 +++++++++++++++++++++++
 types/draggabilly/tsconfig.json        | 23 +++++++++++++
 types/draggabilly/tslint.json          |  1 +
 4 files changed, 112 insertions(+)
 create mode 100644 types/draggabilly/draggabilly-tests.ts
 create mode 100644 types/draggabilly/index.d.ts
 create mode 100644 types/draggabilly/tsconfig.json
 create mode 100644 types/draggabilly/tslint.json

diff --git a/types/draggabilly/draggabilly-tests.ts b/types/draggabilly/draggabilly-tests.ts
new file mode 100644
index 0000000000..6ab38e6c13
--- /dev/null
+++ b/types/draggabilly/draggabilly-tests.ts
@@ -0,0 +1,46 @@
+import Draggabilly from 'draggabilly';
+
+const elem = document.querySelector('.draggable') as Element;
+
+const draggieA = new Draggabilly('.test');
+const draggieB = new Draggabilly(elem);
+
+const draggie = new Draggabilly(elem, {
+    axis: 'x',
+    containment: true,
+    grid: [20, 20],
+    handle: '.handle'
+});
+
+const draggiePosX: number = draggie.position.x;
+const draggiePosY: number = draggie.position.y;
+
+draggie.on( 'dragMove', (event, pointer, moveVector) => {
+    const pointerPageX: number = pointer.pageX;
+    const pointePageY: number = pointer.pageY;
+
+    const moveVectorX: number = moveVector.x;
+    const moveVectorY: number = moveVector.y;
+});
+
+draggie.on( 'dragStart', (event, pointer) => {});
+
+draggie.on( 'dragEnd', (event, pointer) => {});
+
+draggie.on( 'pointerDown', (event, pointer) => {});
+
+draggie.on( 'pointerMove', (event, pointer, moveVector) => {});
+
+draggie.on( 'pointerUp', (event, pointer) => {});
+
+draggie.on( 'staticClick', (event, pointer) => {});
+
+draggie.off('dragMove', (event, pointer, moveVector) => {});
+
+draggie.once('dragMove', (event, pointer, moveVector) => {});
+
+draggie.enable();
+
+draggie.disable();
+
+draggie.destroy();
diff --git a/types/draggabilly/index.d.ts b/types/draggabilly/index.d.ts
new file mode 100644
index 0000000000..3bc3e3a10e
--- /dev/null
+++ b/types/draggabilly/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for draggabilly 2.1
+// Project: http://draggabilly.desandro.com/
+// Definitions by: Jason Wu <https://github.com/jaydubu/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'draggabilly' {
+    interface Position { 
+        x: number; 
+        y: number;
+    }
+
+    export interface DraggabillyOptions {
+        axis?: 'x' | 'y';
+        containment?: Element | string | boolean;
+        grid?: [number, number];
+        handle?: string;
+    }
+
+    export type DraggabillyEventName = 'dragStart' | 'dragMove' | 'dragEnd' | 'pointerDown' | 'pointerMove' | 'pointerUp'
+        | 'staticClick';
+
+    export default class Draggabilly {
+        position: Position;
+
+        constructor(element: Element | string, options?: DraggabillyOptions);
+
+        on(eventName: DraggabillyEventName,
+           listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): void;
+
+        off(eventName: DraggabillyEventName,
+            listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): void;
+
+        once(eventName: DraggabillyEventName,
+             listener: (event: Event, pointer: MouseEvent | Touch, moveVector?: Position) => void): void;
+
+        enable(): void;
+
+        disable(): void;
+
+        destroy(): void;
+    }
+}
diff --git a/types/draggabilly/tsconfig.json b/types/draggabilly/tsconfig.json
new file mode 100644
index 0000000000..32cc6ee235
--- /dev/null
+++ b/types/draggabilly/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "draggabilly-tests.ts"
+    ]
+}
diff --git a/types/draggabilly/tslint.json b/types/draggabilly/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/draggabilly/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e076754cc7dd747e80d961510923b18ddf1e9c4d Mon Sep 17 00:00:00 2001
From: Jason Wu <jason.a.wu@accenture.com>
Date: Sat, 1 Jul 2017 12:46:13 -0500
Subject: [PATCH 237/287] Added TypeScript version

---
 types/draggabilly/index.d.ts    | 8 ++++++--
 types/draggabilly/tsconfig.json | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/types/draggabilly/index.d.ts b/types/draggabilly/index.d.ts
index 3bc3e3a10e..c614796ca9 100644
--- a/types/draggabilly/index.d.ts
+++ b/types/draggabilly/index.d.ts
@@ -2,10 +2,14 @@
 // Project: http://draggabilly.desandro.com/
 // Definitions by: Jason Wu <https://github.com/jaydubu/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// export = Backbone;
+// export as namespace Backbone;
 
 declare module 'draggabilly' {
-    interface Position { 
-        x: number; 
+    interface Position {
+        x: number;
         y: number;
     }
 
diff --git a/types/draggabilly/tsconfig.json b/types/draggabilly/tsconfig.json
index 32cc6ee235..c0873c7293 100644
--- a/types/draggabilly/tsconfig.json
+++ b/types/draggabilly/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
+        "strictNullChecks": false,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 3d3e779a3295beaa7bce84f39ab7d8bdc4bd6bbc Mon Sep 17 00:00:00 2001
From: mmkal <mkal@Michaels-Mac-mini-2.local>
Date: Sat, 1 Jul 2017 14:15:26 -0400
Subject: [PATCH 238/287] feat: use typescript type indexing to make find*
 functions more helpful.

This turns WhereOptions and FindOptions into generic types, which can then check that you are using the correct column names, in the find* functions (findOne, findAll etc.). In other places where there is no attributes type available, fall back to the old behaviour of allowing any field names (now with types named AnyWhereOptions and AnyFindOptions).

This allows typescript to catch more errors, e.g.

User.findOne({ where: { firstName: 'Bob' } });
vs.
User.findOne({ where: { first_name: 'Bob' } });
---
 types/sequelize/index.d.ts         | 102 ++++++++++++++++-------------
 types/sequelize/sequelize-tests.ts |  60 +++++++++++++----
 2 files changed, 103 insertions(+), 59 deletions(-)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 86ecb00809..8d0a379bbe 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -10,7 +10,6 @@
 
 
 import * as _ from "lodash";
-import * as Promise from "bluebird";
 
 declare namespace sequelize {
 
@@ -259,7 +258,7 @@ declare namespace sequelize {
         /**
          * An optional where clause to limit the associated models.
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * Apply a scope on the related model, or remove its default scope by passing false.
@@ -346,7 +345,7 @@ declare namespace sequelize {
          */
         (
             newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-            options?: HasManySetAssociationsMixinOptions | FindOptions | InstanceUpdateOptions
+            options?: HasManySetAssociationsMixinOptions | AnyFindOptions | InstanceUpdateOptions
         ): Promise<void>;
     }
 
@@ -672,7 +671,7 @@ declare namespace sequelize {
         /**
          * An optional where clause to limit the associated models.
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * Apply a scope on the related model, or remove its default scope by passing false.
@@ -722,7 +721,7 @@ declare namespace sequelize {
         /**
          * An optional where clause to limit the associated models.
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * Apply a scope on the related model, or remove its default scope by passing false.
@@ -809,7 +808,7 @@ declare namespace sequelize {
          */
         (
             newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-            options?: BelongsToManySetAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
+            options?: BelongsToManySetAssociationsMixinOptions | AnyFindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
         ): Promise<void>;
     }
 
@@ -858,7 +857,7 @@ declare namespace sequelize {
          */
         (
             newAssociations?: Array<TInstance | TInstancePrimaryKey>,
-            options?: BelongsToManyAddAssociationsMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
+            options?: BelongsToManyAddAssociationsMixinOptions | AnyFindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
         ): Promise<void>;
     }
 
@@ -907,7 +906,7 @@ declare namespace sequelize {
          */
         (
             newAssociation?: TInstance | TInstancePrimaryKey,
-            options?: BelongsToManyAddAssociationMixinOptions | FindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
+            options?: BelongsToManyAddAssociationMixinOptions | AnyFindOptions | BulkCreateOptions | InstanceUpdateOptions | InstanceDestroyOptions | { through: TJoinTableAttributes }
         ): Promise<void>;
     }
 
@@ -1135,7 +1134,7 @@ declare namespace sequelize {
         /**
          * An optional where clause to limit the associated models.
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * Apply a scope on the related model, or remove its default scope by passing false.
@@ -2613,7 +2612,7 @@ declare namespace sequelize {
         /**
          * A hash of attributes to describe your search. See above for examples.
          */
-        where?: WhereOptions | Array<col | and | or | string>;
+        where?: AnyWhereOptions | Array<col | and | or | string>;
 
     }
 
@@ -2663,7 +2662,7 @@ declare namespace sequelize {
         /**
          * A hash of attributes to describe your search. See above for examples.
          */
-        where?: WhereOptions | Array<col | and | or | string>;
+        where?: AnyWhereOptions | Array<col | and | or | string>;
 
     }
 
@@ -2824,7 +2823,7 @@ declare namespace sequelize {
          * return a new instance. With this method, all references to the Instance are updated with the new data
          * and no new objects are created.
          */
-        reload(options?: FindOptions): Promise<this>;
+        reload(options?: AnyFindOptions): Promise<this>;
 
         /**
          * Validate the attribute of this instance according to validation rules set in the model definition.
@@ -3031,8 +3030,8 @@ declare namespace sequelize {
      * Where Complex nested query
      */
     interface WhereNested {
-        $and: Array<WhereOptions | WhereLogic>;
-        $or: Array<WhereOptions | WhereLogic>;
+        $and: Array<AnyWhereOptions | WhereLogic>;
+        $or: Array<AnyWhereOptions | WhereLogic>;
     }
 
     /**
@@ -3054,10 +3053,10 @@ declare namespace sequelize {
     /**
      * Logic of where statement
      */
-    interface WhereLogic {
+    type WhereLogic = Partial<{
         $ne: string | number | WhereLogic;
         $in: Array<string | number> | literal;
-        $not: boolean | string | number | WhereOptions;
+        $not: boolean | string | number | AnyWhereOptions;
         $notIn: Array<string | number> | literal;
         $gte: number | string | Date;
         $gt: number | string | Date;
@@ -3078,7 +3077,7 @@ declare namespace sequelize {
         "@>": any;
         $contained: any;
         "<@": any;
-    }
+    }>;
 
     /**
      * A hash of attributes to describe your search. See above for examples.
@@ -3086,8 +3085,15 @@ declare namespace sequelize {
      * We did put Object in the end, because there where query might be a JSON Blob. It cripples a bit the
      * typesafety, but there is no way to pass the tests if we just remove it.
      */
-    interface WhereOptions {
-        [field: string]: string | number | WhereLogic | WhereOptions | col | and | or | WhereGeometryOptions | Array<string | number> | Object | null;
+    type WhereOptions<T> = {
+        [P in keyof T]?: string | number | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | Array<string | number> | null;
+    };
+
+    /**
+     * A hash of attributes to describe your search, accepting any field names. See `WhereOptions` for details.
+     */
+    interface AnyWhereOptions {
+        [field: string]: WhereOptions<any>[] | Object;
     }
 
     /**
@@ -3098,7 +3104,7 @@ declare namespace sequelize {
         /**
          * Filter on the join model for belongsToMany relations
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * A list of attributes to select from the join model for belongsToMany relations
@@ -3141,7 +3147,7 @@ declare namespace sequelize {
          * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
          * unless you explicitly set `required: false`
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * A list of attributes to select from the child model
@@ -3183,12 +3189,12 @@ declare namespace sequelize {
 *
 * A hash of options to describe the scope of the search
 */
-    interface FindOptions extends LoggingOptions, SearchPathOptions {
+    interface FindOptions<T> extends LoggingOptions, SearchPathOptions {
 
         /**
          * A hash of attributes to describe your search. See above for examples.
          */
-        where?: WhereOptions | fn | Array<col | and | or | string>;
+        where?: WhereOptions<T> | fn | Array<col | and | or | string>;
 
         /**
          * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with
@@ -3245,7 +3251,7 @@ declare namespace sequelize {
         /**
          * having ?!?
          */
-        having?: WhereOptions;
+        having?: AnyWhereOptions;
 
         /**
          * Group by. It is not mentioned in sequelize's JSDoc, but mentioned in docs.
@@ -3265,6 +3271,8 @@ declare namespace sequelize {
         subQuery?: boolean;
     }
 
+    type AnyFindOptions = FindOptions<any>;
+
     /**
      * Options for Model.count method
      */
@@ -3273,7 +3281,7 @@ declare namespace sequelize {
         /**
          * A hash of search attributes.
          */
-        where?: WhereOptions | string[];
+        where?: AnyWhereOptions | string[];
 
         /**
          * Include options. See `find` for details
@@ -3335,7 +3343,7 @@ declare namespace sequelize {
     /**
      * Options for Model.findOrInitialize method
      */
-    interface FindOrInitializeOptions<TAttributes> extends FindOptions {
+    interface FindOrInitializeOptions<TAttributes> extends AnyFindOptions {
 
         /**
          * Default values to use if building a new instance
@@ -3347,7 +3355,7 @@ declare namespace sequelize {
     /**
      * Options for Model.findOrInitialize method
      */
-    interface FindCreateFindOptions<TAttributes> extends FindOptions {
+    interface FindCreateFindOptions<TAttributes> extends FindOptions<TAttributes> {
 
         /**
          * Default values to use if building a new instance
@@ -3423,7 +3431,7 @@ declare namespace sequelize {
         /**
          * Filter the destroy
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * Run before / after bulk destroy hooks?
@@ -3462,7 +3470,7 @@ declare namespace sequelize {
         /**
          * Filter the restore
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * Run before / after bulk restore hooks?
@@ -3495,7 +3503,7 @@ declare namespace sequelize {
         /**
          * Options to describe the scope of the search.
          */
-        where: WhereOptions;
+        where: AnyWhereOptions;
 
         /**
          * Run before / after bulk update hooks?
@@ -3543,7 +3551,7 @@ declare namespace sequelize {
         /**
          * A hash of search attributes.
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
         /**
          * The type of the result. If `field` is a field in this Model, the default will be the type of that field,
@@ -3634,7 +3642,7 @@ declare namespace sequelize {
          * @param {Object}          [options]
          * @param {Boolean}         [options.override=false]
          */
-        addScope(name: string, scope: FindOptions | Function, options?: AddScopeOptions): void;
+        addScope(name: string, scope: AnyFindOptions | Function, options?: AddScopeOptions): void;
 
         /**
              * Add a new scope to the model. This is especially useful for adding scopes with includes, when the model you want to include is not available at the time this model is defined.
@@ -3646,7 +3654,7 @@ declare namespace sequelize {
              * @param {Object}          [options]
              * @param {Boolean}         [options.override=false]
              */
-        addScope(name: string, scope: FindOptions | Function, options?: AddScopeOptions): void;
+        addScope(name: string, scope: AnyFindOptions | Function, options?: AddScopeOptions): void;
 
         /**
  * Apply a scope created in `define` to the model. First let's look at how to create scopes:
@@ -3695,7 +3703,7 @@ declare namespace sequelize {
  * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
  *     model will clear the previous scope.
  */
-        scope(options?: string | ScopeOptions | WhereOptions | Array<string | ScopeOptions | WhereOptions>): this;
+        scope(options?: string | ScopeOptions | AnyWhereOptions | Array<string | ScopeOptions | AnyWhereOptions>): this;
 
         /**
          * Search for multiple instances.
@@ -3759,22 +3767,22 @@ declare namespace sequelize {
          *
          * @see    {Sequelize#query}
          */
-        findAll(options?: FindOptions): Promise<TInstance[]>;
-        all(optionz?: FindOptions): Promise<TInstance[]>;
+        findAll<TCustomAttributes>(options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance[]>;
+        all<TCustomAttributes>(optionz?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance[]>;
 
         /**
          * Search for a single instance by its primary key. This applies LIMIT 1, so the listener will
          * always be called with a single instance.
          */
-        findById(identifier?: number | string, options?: FindOptions): Promise<TInstance | null>;
-        findByPrimary(identifier?: number | string, options?: FindOptions): Promise<TInstance | null>;
+        findById<TCustomAttributes>(identifier?: number | string, options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance | null>;
+        findByPrimary<TCustomAttributes>(identifier?: number | string, options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance | null>;
 
         /**
          * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single
          * instance.
          */
-        findOne(options?: FindOptions): Promise<TInstance | null>;
-        find(options?: FindOptions): Promise<TInstance | null>;
+        findOne<TCustomAttributes>(options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance | null>;
+        find<TCustomAttributes>(options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance | null>;
 
         /**
          * Run an aggregation method on the specified field
@@ -3829,8 +3837,8 @@ declare namespace sequelize {
          * without
          * profiles will be counted
          */
-        findAndCount(options?: FindOptions): Promise<{ rows: TInstance[], count: number }>;
-        findAndCountAll(options?: FindOptions): Promise<{ rows: TInstance[], count: number }>;
+        findAndCount<TCustomAttributes>(options?: FindOptions<TAttributes & TCustomAttributes>): Promise<{ rows: TInstance[], count: number }>;
+        findAndCountAll<TCustomAttributes>(options?: FindOptions<TAttributes & TCustomAttributes>): Promise<{ rows: TInstance[], count: number }>;
 
         /**
          * Find the maximum value of field
@@ -3886,7 +3894,7 @@ declare namespace sequelize {
              * A more performant findOrCreate that will not work under a transaction (at least not in postgres)
              * Will execute a find call, if empty then attempt to create, if unique constraint then attempt to find again
              */
-        findCreateFind(options: FindCreateFindOptions<TAttributes>): Promise<TInstance>;
+        findCreateFind<TCustomAttributes>(options: FindCreateFindOptions<TAttributes & TCustomAttributes>): Promise<TInstance>;
 
         /**
  * Insert or update a single row. An update will be executed if a row which matches the supplied values on
@@ -3994,7 +4002,7 @@ declare namespace sequelize {
     interface AddCheckConstraintOptions {
         type: 'check';
         name?: string;
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
     }
 
     interface AddPrimaryKeyConstraintOptions {
@@ -4850,7 +4858,7 @@ declare namespace sequelize {
         /**
          * Condition for partioal index
          */
-        where?: WhereOptions;
+        where?: AnyWhereOptions;
 
     }
 
@@ -4901,7 +4909,7 @@ declare namespace sequelize {
         /**
          * Name of the scope and it's query
          */
-        [scopeName: string]: FindOptions | Function;
+        [scopeName: string]: AnyFindOptions | Function;
 
     }
 
@@ -4916,7 +4924,7 @@ declare namespace sequelize {
          * Define the default search scope to use for this model. Scopes have the same form as the options passed to
          * find / findAll.
          */
-        defaultScope?: FindOptions;
+        defaultScope?: AnyFindOptions;
 
         /**
          * More scopes, defined in the same way as defaultScope above. See `Model.scope` for more information about
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index d786dfc4a2..3f8001f4f1 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -983,7 +983,7 @@ User.create( { title : 'Chair', creator : { first_name : 'Matt', last_name : 'Ha
 User.create( { id : 1, title : 'e', Tags : [{ id : 1, name : 'c' }, { id : 2, name : 'd' }] }, { include : [User] } );
 User.create( { id : 'My own ID!' } ).then( ( i ) => i.isNewRecord );
 
-let findOrRetVal: Bluebird<[AnyInstance, boolean]>;
+let findOrRetVal: Promise<[AnyInstance, boolean]>;
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' } } );
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' }, transaction : t } );
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' }, defaults : { foo : 'asd' }, transaction : t } );
@@ -1318,7 +1318,7 @@ s.define( 'ProductWithSettersAndGetters1', {
         get : function() {
             return 'answer = ' + this.getDataValue( 'price' );
         },
-        set : function( v ) {
+        set : function( v: number ) {
             return this.setDataValue( 'price', v + 42 );
         }
     }
@@ -1437,6 +1437,37 @@ s.define( 'ScopeMe', {
     }
 } );
 
+// Generic find options
+interface ChairAttributes {
+    id: number;
+    color: string;
+    legs: number;
+}
+interface ChairInstance extends Sequelize.Instance<ChairAttributes> {}
+
+const Chair = s.define<ChairInstance, ChairAttributes>('chair', {});
+
+Chair.findAll({
+    where: {
+        color: 'blue',
+        legs: { $in: [3, 4] },
+    },
+});
+
+// If you want to use a property that isn't explicitly on the model's Attributes
+// use the find-function's generic type parameter.
+Chair.findAll<{ customProperty: number }>({
+    where: {
+        customProperty: 123,
+    }
+});
+Chair.findAll<any>({
+    where: {
+        customProperty1: 123,
+        customProperty2: 456,
+    }
+});
+
 s.define( 'ScopeMe', {
     username : Sequelize.STRING,
     email : Sequelize.STRING,
@@ -1640,21 +1671,21 @@ s.transaction({
     });
 
 s.transaction( function() {
-    return Bluebird.resolve();
+    return Promise.resolve();
 } );
-s.transaction( { isolationLevel : 'SERIALIZABLE' }, function( t ) { return Bluebird.resolve(); } );
-s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.SERIALIZABLE }, (t) => Bluebird.resolve() );
-s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.READ_COMMITTED }, (t) => Bluebird.resolve() );
+s.transaction( { isolationLevel : 'SERIALIZABLE' }, function( t ) { return Promise.resolve(); } );
+s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.SERIALIZABLE }, (t) => Promise.resolve() );
+s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.READ_COMMITTED }, (t) => Promise.resolve() );
 
 // transaction types
 new Sequelize( '', { transactionType: 'DEFERRED' } );
 new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.DEFERRED} );
 new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.IMMEDIATE} );
 new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.EXCLUSIVE} );
-s.transaction( { type : 'DEFERRED' }, (t) => Bluebird.resolve() );
-s.transaction( { type : s.Transaction.TYPES.DEFERRED }, (t) => Bluebird.resolve() );
-s.transaction( { type : s.Transaction.TYPES.IMMEDIATE }, (t) => Bluebird.resolve() );
-s.transaction( { type : s.Transaction.TYPES.EXCLUSIVE }, (t) => Bluebird.resolve() );
+s.transaction( { type : 'DEFERRED' }, (t) => Promise.resolve() );
+s.transaction( { type : s.Transaction.TYPES.DEFERRED }, (t) => Promise.resolve() );
+s.transaction( { type : s.Transaction.TYPES.IMMEDIATE }, (t) => Promise.resolve() );
+s.transaction( { type : s.Transaction.TYPES.EXCLUSIVE }, (t) => Promise.resolve() );
 
 // promise transaction
 s.transaction(async () => {
@@ -1662,14 +1693,19 @@ s.transaction(async () => {
 s.transaction((): Promise<void> => {
     return Promise.resolve();
 });
-s.transaction((): Bluebird<void> => {
-    return Bluebird.resolve();
+s.transaction((): Promise<void> => {
+    return Promise.resolve();
 });
 s.transaction((): Q.Promise<void> => {
     return Q.Promise<void>((resolve) => {
         resolve(null);
     });
 });
+s.transaction((): Bluebird<void> => {
+    return new Bluebird<void>((resolve) => {
+        resolve(null);
+    });
+});
 
 // sync options types
 s.sync({

From c529e86caa635547021153beb9546f0b56c8c8e5 Mon Sep 17 00:00:00 2001
From: Clark Stevenson <clark@drimlike.com>
Date: Sat, 1 Jul 2017 20:31:07 +0100
Subject: [PATCH 239/287] Pixi.js minor update to v4.5.3

---
 types/pixi.js/index.d.ts | 130 ++++++++++++++++++++++++++-------------
 1 file changed, 88 insertions(+), 42 deletions(-)

diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index bcf403d475..d847babaae 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -199,25 +199,6 @@ declare namespace PIXI {
 
     // display
 
-    interface ApplicationOptions extends RendererOptions {
-        view?: HTMLCanvasElement;
-        transparent?: boolean;
-        autoResize?: boolean;
-        antialias?: boolean;
-        resolution?: number;
-        clearBeforeRender?: boolean;
-        backgroundColor?: number;
-        roundPixels?: boolean;
-        context?: WebGLRenderingContext;
-        preserveDrawingBuffer?: boolean;
-        legacy?: boolean;
-        width?: number;
-        height?: number;
-        forceCanvas?: boolean;
-        sharedTicker?: boolean;
-        sharedLoader?: boolean;
-    }
-
     class Application {
         constructor(options?: ApplicationOptions)
         constructor(width?: number, height?: number, options?: ApplicationOptions, noWebGL?: boolean, sharedTicker?: boolean, sharedLoader?: boolean);
@@ -725,18 +706,91 @@ declare namespace PIXI {
     }
     // renderers
     interface RendererOptions {
-        view?: HTMLCanvasElement;
-        transparent?: boolean;
-        autoResize?: boolean;
-        antialias?: boolean;
-        resolution?: number;
-        clearBeforeRender?: boolean;
-        backgroundColor?: number;
-        roundPixels?: boolean;
-        context?: WebGLRenderingContext;
+        /**
+         * the width of the renderers view [default=800]
+         */
         width?: number;
+
+        /**
+         * the height of the renderers view [default=600]
+         */
         height?: number;
+
+        /**
+         * the canvas to use as a view, optional
+         */
+        view?: HTMLCanvasElement;
+
+        /**
+         * If the render view is transparent, [default=false]
+         */
+        transparent?: boolean;
+
+        /**
+         * sets antialias (only applicable in chrome at the moment) [default=false]
+         */
+        antialias?: boolean;
+
+        /**
+         * enables drawing buffer preservation, enable this if you need to call toDataUrl on the webgl context [default=false]
+         */
+        preserveDrawingBuffer?: boolean;
+
+        /**
+         * The resolution / device pixel ratio of the renderer, retina would be 2 [default=1]
+         */
+        resolution?: number;
+
+        /**
+         * prevents selection of WebGL renderer, even if such is present [default=false]
+         */
         forceCanvas?: boolean;
+
+        /**
+         * The background color of the rendered area (shown if not transparent) [default=0x000000]
+         */
+        backgroundColor?: number;
+
+        /**
+         * This sets if the renderer will clear the canvas or not before the new render pass. [default=true]
+         */
+        clearBeforeRender?: boolean;
+
+        /**
+         * If true Pixi will Math.floor() x/ y values when rendering, stopping pixel interpolation. [default=false]
+         */
+        roundPixels?: boolean;
+
+        /**
+         * forces FXAA antialiasing to be used over native FXAA is faster, but may not always look as great ** webgl only** [default=false]
+         */
+        forceFXAA?: boolean;
+
+        /**
+         * `true` to ensure compatibility with older / less advanced devices. If you experience unexplained flickering try setting this to true. **webgl only** [default=false]
+         */
+        legacy?: boolean;
+
+        /**
+         * Depricated
+         */
+        context?: WebGLRenderingContext;
+
+        /**
+         * Depricated
+         */
+        autoResize?: boolean;
+    }
+    interface ApplicationOptions extends RendererOptions {
+        /**
+         * `true` to use PIXI.ticker.shared, `false` to create new ticker. [default=false]
+         */
+        sharedTicker?: boolean;
+
+        /**
+         * `true` to use PIXI.loaders.shared, `false` to create new Loader.
+         */
+        sharedLoader?: boolean;
     }
     class SystemRenderer extends utils.EventEmitter {
         constructor(system: string, options?: RendererOptions);
@@ -825,20 +879,7 @@ declare namespace PIXI {
         resize(width: number, height: number): void;
         destroy(): void;
     }
-    interface WebGLRendererOptions {
-        view?: HTMLCanvasElement;
-        transparent?: boolean;
-        autoResize?: boolean;
-        antialias?: boolean;
-        forceFXAA?: boolean;
-        resolution?: number;
-        clearBeforeRender?: boolean;
-        backgroundColor?: number;
-        preserveDrawingBuffer?: boolean;
-        roundPixels?: boolean;
-        legacy?: boolean;
-        width?: number;
-        height?: number;
+    interface WebGLRendererOptions extends RendererOptions {
     }
     class WebGLRenderer extends SystemRenderer {
         // plugintarget mixin start
@@ -2713,6 +2754,11 @@ declare namespace PIXI {
         function isWebGLSupported(): boolean;
         function sign(n: number): number;
         function removeItems<T>(arr: T[], startIdx: number, removeCount: number): void;
+        function correctBlendMode(blendMode: number, premultiplied: boolean): number;
+        function premultiplyTint(tint: number, alpha: number): number;
+        function premultiplyRgba(rgb: Float32Array | number[], alpha: number, out?: Float32Array, premultiply?: boolean): Float32Array;
+        function premultiplyTintToRgba(tint: number, alpha: number, out?: Float32Array, premultiply?: boolean): Float32Array;
+        const premultiplyBlendMode: number[][];
         const TextureCache: any;
         const BaseTextureCache: any;
 

From 0ea94a0d2ece04c9ecaedf21e44621c23ca89869 Mon Sep 17 00:00:00 2001
From: Clark Stevenson <clark@drimlike.com>
Date: Sat, 1 Jul 2017 21:03:36 +0100
Subject: [PATCH 240/287] Quick bug fix

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

diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index d847babaae..f7410baaa6 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -2553,12 +2553,18 @@ declare namespace PIXI {
 
             protected maxItemsPerFrame: number;
             protected itemsLeft: number;
+
+            beginFrame(): void;
+            allowedToUpload(): boolean;
         }
         class TimeLimiter {
             constructor(maxMilliseconds: number);
 
             protected maxMilliseconds: number;
             protected frameStart: number;
+
+            beginFrame(): void;
+            allowedToUpload(): boolean;
         }
     }
 

From 370d4fca0035b771070e0eceb4b7e363046c0bd9 Mon Sep 17 00:00:00 2001
From: Augustin Peyrard <augustin.peyrard@gmail.com>
Date: Fri, 30 Jun 2017 21:11:20 -0700
Subject: [PATCH 241/287] fix: in `node.readline` `cursorTo` allows only x
 coordinate

Like this we are easily able to move in the current line with
absolute x-axis coordinate.
---
 types/node/index.d.ts    | 2 +-
 types/node/node-tests.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index f9716e3e83..4fbcfd8279 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1731,7 +1731,7 @@ declare module "readline" {
     export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
     export function createInterface(options: ReadLineOptions): ReadLine;
 
-    export function cursorTo(stream: NodeJS.WritableStream, x: number, y: number): void;
+    export function cursorTo(stream: NodeJS.WritableStream, x: number, y?: number): void;
     export function moveCursor(stream: NodeJS.WritableStream, dx: number | string, dy: number | string): void;
     export function clearLine(stream: NodeJS.WritableStream, dir: number): void;
     export function clearScreenDown(stream: NodeJS.WritableStream): void;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 84625061a2..fef0cd9862 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -1410,6 +1410,7 @@ namespace readline_tests {
         let x: number;
         let y: number;
 
+        readline.cursorTo(stream, x);
         readline.cursorTo(stream, x, y);
     }
 

From e5bce784caa01b271d039ae1aef6b363921aae5a Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 2 Jul 2017 10:28:55 -0400
Subject: [PATCH 242/287] [jquery] Fix uncaught test errors.

---
 types/jquery/jquery-tests.ts | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 325a288889..35b91fe1d3 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -1191,9 +1191,6 @@ function JQuery() {
                 this;
             });
 
-            // $ExpectType JQuery<HTMLElement>
-            $('p').toggle('linear');
-
             // $ExpectType JQuery<HTMLElement>
             $('p').toggle(true);
 
@@ -5748,15 +5745,9 @@ function Promise3() {
             return 1;
         });
 
-        // $ExpectType Promise3<string, never, never, never, never, never, never, never, never>
+        // $ExpectType Promise3<I1, never, never, never, never, never, never, never, never>
         $.ajax('/echo/json').catch(() => {
-            const t: JQuery.Thenable<string> = {
-                then() {
-                    return Promise.resolve('myValue');
-                }
-            };
-
-            return t;
+            return t1;
         });
 
         // $ExpectType Promise3<any, jqXHR<any>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<any>, string, never>

From 28dd8dcd3f796225bfb1163fec5aefe2728f0c0f Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 2 Jul 2017 10:58:23 -0400
Subject: [PATCH 243/287] [jquery] Collapse JQuery declarations. Base types
 were declared separately because JQuery was a class at one point. This used
 class-interface merging to avoid having to declare base type members.

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 834ee4c70d..9ff83fad93 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -38,7 +38,7 @@ declare const $: JQueryStatic;
 // Used by JQuery.Event
 type _Event = Event;
 
-interface JQuery<TElement extends Node = HTMLElement> {
+interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> {
     /**
      * A string containing the jQuery version number.
      *
@@ -2394,8 +2394,6 @@ interface JQuery<TElement extends Node = HTMLElement> {
     [n: number]: TElement;
 }
 
-interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> { }
-
 interface JQueryStatic<TElement extends Node = HTMLElement> {
     /**
      * A factory function that returns a chainable utility object with methods to register multiple

From 07257c41a0be1d277cce868f58698ef548cc102f Mon Sep 17 00:00:00 2001
From: Tim <tdhutt@gmail.com>
Date: Sun, 2 Jul 2017 16:09:31 +0100
Subject: [PATCH 244/287] Fix Leaflet bug #17685

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

diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index 80adf4bc3f..951bc4b22d 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -399,7 +399,7 @@ declare namespace L {
 
     class Layer extends Evented {
         constructor(options?: LayerOptions);
-        addTo(map: Map): this;
+        addTo(map: Map|LayerGroup): this;
         remove(): this;
         removeFrom(map: Map): this;
         getPane(name?: string): HTMLElement | undefined;

From 10f0a52b7fc260ffae6937262e42b6fefec72e11 Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard.thieu@gmail.com>
Date: Sun, 2 Jul 2017 11:13:40 -0400
Subject: [PATCH 245/287] [jquery] Remove Promise1. Promise1 is not being used.

---
 types/jquery/index.d.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 9ff83fad93..b71bfbbed3 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4670,16 +4670,6 @@ declare namespace JQuery {
         UR, UJ, UN,
         never, never, never> { }
 
-    /**
-     * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
-     * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
-     *
-     * @see {@link http://api.jquery.com/Types/#Promise}
-     */
-    interface Promise1<TR, TJ, TN> extends Promise3<TR, TJ, TN,
-        never, never, never,
-        never, never, never> { }
-
     /**
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.

From 1bdaeb9cbfade9ba325392fde20f5e9d57d0c72e Mon Sep 17 00:00:00 2001
From: Jason Wu <jason.a.wu@accenture.com>
Date: Sun, 2 Jul 2017 11:47:34 -0500
Subject: [PATCH 246/287] Wrote it as an external module

---
 types/draggabilly/index.d.ts    | 50 ++++++++++++++-------------------
 types/draggabilly/tsconfig.json |  2 +-
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/types/draggabilly/index.d.ts b/types/draggabilly/index.d.ts
index c614796ca9..f376ea8fbd 100644
--- a/types/draggabilly/index.d.ts
+++ b/types/draggabilly/index.d.ts
@@ -4,43 +4,35 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// export = Backbone;
-// export as namespace Backbone;
+export interface Position {
+    x: number;
+    y: number;
+}
 
-declare module 'draggabilly' {
-    interface Position {
-        x: number;
-        y: number;
-    }
+export interface DraggabillyOptions {
+    axis?: 'x' | 'y';
+    containment?: Element | string | boolean;
+    grid?: [number, number];
+    handle?: string;
+}
 
-    export interface DraggabillyOptions {
-        axis?: 'x' | 'y';
-        containment?: Element | string | boolean;
-        grid?: [number, number];
-        handle?: string;
-    }
+export type DraggabillyEventName = 'dragStart' | 'dragMove' | 'dragEnd' | 'pointerDown' | 'pointerMove' | 'pointerUp'
+    | 'staticClick';
 
-    export type DraggabillyEventName = 'dragStart' | 'dragMove' | 'dragEnd' | 'pointerDown' | 'pointerMove' | 'pointerUp'
-        | 'staticClick';
+export default class Draggabilly {
+    position: Position;
 
-    export default class Draggabilly {
-        position: Position;
+    constructor(element: Element | string, options?: DraggabillyOptions);
 
-        constructor(element: Element | string, options?: DraggabillyOptions);
+    on(eventName: DraggabillyEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): Draggabilly;
 
-        on(eventName: DraggabillyEventName,
-           listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): void;
+    off(eventName: DraggabillyEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): Draggabilly;
 
-        off(eventName: DraggabillyEventName,
-            listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): void;
+    once(eventName: DraggabillyEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector?: Position) => void): Draggabilly;
 
-        once(eventName: DraggabillyEventName,
-             listener: (event: Event, pointer: MouseEvent | Touch, moveVector?: Position) => void): void;
+    enable(): void;
 
-        enable(): void;
+    disable(): void;
 
-        disable(): void;
-
-        destroy(): void;
-    }
+    destroy(): void;
 }
diff --git a/types/draggabilly/tsconfig.json b/types/draggabilly/tsconfig.json
index c0873c7293..32cc6ee235 100644
--- a/types/draggabilly/tsconfig.json
+++ b/types/draggabilly/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 7c9c69ade07a80533ebf356a6ee662fe45a65109 Mon Sep 17 00:00:00 2001
From: Tom Sherman <thomasgsherman@gmail.com>
Date: Sun, 2 Jul 2017 15:27:13 -0700
Subject: [PATCH 247/287] @types/mapbox-gl: allow StyleFunction for
 circle-color

Fix regression that removed StyleFunction from circle-color type set
---
 types/mapbox-gl/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 680362fe82..5e08da57b6 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.39.0
+// Type definitions for Mapbox GL JS v0.39.1
 // Project: https://github.com/mapbox/mapbox-gl-js
 // Definitions by: Dominik Bruderer <https://github.com/dobrud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -706,7 +706,7 @@ declare namespace mapboxgl {
 		angleWidth(p: Point): number;
 
 		angleWithSep(x: number, y: number): number;
-		
+
 		convert(a: Array<number> | Point): Point;
 	}
 
@@ -1045,7 +1045,7 @@ declare namespace mapboxgl {
 	export interface CirclePaint {
 		"circle-radius"?: number | StyleFunction;
 		"circle-radius-transition"?: Transition;
-		"circle-color"?: string;
+		"circle-color"?: string | StyleFunction;
 		"circle-blur"?: number | StyleFunction;
 		"circle-opacity"?: number | StyleFunction;
 		"circle-translate"?: number[];

From 517b8d4dd7b0588f8139524b70a8559f10f81c5d Mon Sep 17 00:00:00 2001
From: e020873 <nicolas.henry-partner@arcelormittal.com>
Date: Mon, 3 Jul 2017 01:14:21 +0200
Subject: [PATCH 248/287] [express] fix accepts return

---
 types/express-serve-static-core/index.d.ts | 24 +++++++++++-----------
 types/express/express-tests.ts             |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index bd8647aa77..5e4491c9a1 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -239,9 +239,9 @@ interface Request extends http.IncomingMessage, Express.Request {
         *     // => "json"
         */
     accepts(): string[];
-    accepts(type: string): string | boolean;
-    accepts(type: string[]): string | boolean;
-    accepts(...type: string[]): string | boolean;
+    accepts(type: string): string | false;
+    accepts(type: string[]): string | false;
+    accepts(...type: string[]): string | false;
 
     /**
         * Returns the first accepted charset of the specified character sets,
@@ -252,9 +252,9 @@ interface Request extends http.IncomingMessage, Express.Request {
         * @param charset
         */
     acceptsCharsets(): string[];
-    acceptsCharsets(charset: string): string | boolean;
-    acceptsCharsets(charset: string[]): string | boolean;
-    acceptsCharsets(...charset: string[]): string | boolean;
+    acceptsCharsets(charset: string): string | false;
+    acceptsCharsets(charset: string[]): string | false;
+    acceptsCharsets(...charset: string[]): string | false;
 
     /**
         * Returns the first accepted encoding of the specified encodings,
@@ -265,9 +265,9 @@ interface Request extends http.IncomingMessage, Express.Request {
         * @param encoding
         */
     acceptsEncodings(): string[];
-    acceptsEncodings(encoding: string): string | boolean;
-    acceptsEncodings(encoding: string[]): string | boolean;
-    acceptsEncodings(...encoding: string[]): string | boolean;
+    acceptsEncodings(encoding: string): string | false;
+    acceptsEncodings(encoding: string[]): string | false;
+    acceptsEncodings(...encoding: string[]): string | false;
 
     /**
         * Returns the first accepted language of the specified languages,
@@ -279,9 +279,9 @@ interface Request extends http.IncomingMessage, Express.Request {
         * @param lang
         */
     acceptsLanguages(): string[];
-    acceptsLanguages(lang: string): string | boolean;
-    acceptsLanguages(lang: string[]): string | boolean;
-    acceptsLanguages(...lang: string[]): string | boolean;
+    acceptsLanguages(lang: string): string | false;
+    acceptsLanguages(lang: string[]): string | false;
+    acceptsLanguages(...lang: string[]): string | false;
 
     /**
         * Parse Range header field,
diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 3270a3f391..2891a37d96 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -51,22 +51,22 @@ namespace express_tests {
     router.route('/users')
     .get((req, res, next) => {
         let types: string[] = req.accepts();
-        let type: string | boolean = req.accepts('json');
+        let type: string | false = req.accepts('json');
         type = req.accepts(['json', 'text']);
         type = req.accepts('json', 'text');
 
         let charsets: string[] = req.acceptsCharsets();
-        let charset: string | boolean = req.acceptsCharsets('utf-8');
+        let charset: string | false = req.acceptsCharsets('utf-8');
         charset = req.acceptsCharsets(['utf-8', 'utf-16']);
         charset = req.acceptsCharsets('utf-8', 'utf-16');
 
         let encodings: string[] = req.acceptsEncodings();
-        let encoding: string | boolean = req.acceptsEncodings('gzip');
+        let encoding: string | false = req.acceptsEncodings('gzip');
         encoding = req.acceptsEncodings(['gzip', 'deflate']);
         encoding = req.acceptsEncodings('gzip', 'deflate');
 
         let languages: string[] = req.acceptsLanguages();
-        let language: string | boolean = req.acceptsLanguages('en');
+        let language: string | false = req.acceptsLanguages('en');
         language = req.acceptsLanguages(['en', 'ja']);
         language = req.acceptsLanguages('en', 'ja');
 

From 79317ed00f0ac565778ef61ce80b1dc9806e9484 Mon Sep 17 00:00:00 2001
From: mmkal <mkal@Michaels-Mac-mini-2.local>
Date: Sun, 2 Jul 2017 22:02:46 -0400
Subject: [PATCH 249/287] go back to bluebird promises

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 8d0a379bbe..cc4934a41c 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -10,6 +10,7 @@
 
 
 import * as _ from "lodash";
+import * as Promise from "bluebird";
 
 declare namespace sequelize {
 
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 3f8001f4f1..e9a8924053 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -983,7 +983,7 @@ User.create( { title : 'Chair', creator : { first_name : 'Matt', last_name : 'Ha
 User.create( { id : 1, title : 'e', Tags : [{ id : 1, name : 'c' }, { id : 2, name : 'd' }] }, { include : [User] } );
 User.create( { id : 'My own ID!' } ).then( ( i ) => i.isNewRecord );
 
-let findOrRetVal: Promise<[AnyInstance, boolean]>;
+let findOrRetVal: Bluebird<[AnyInstance, boolean]>;
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' } } );
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' }, transaction : t } );
 findOrRetVal = User.findOrInitialize( { where : { username : 'foo' }, defaults : { foo : 'asd' }, transaction : t } );
@@ -1701,11 +1701,6 @@ s.transaction((): Q.Promise<void> => {
         resolve(null);
     });
 });
-s.transaction((): Bluebird<void> => {
-    return new Bluebird<void>((resolve) => {
-        resolve(null);
-    });
-});
 
 // sync options types
 s.sync({

From b40190a3414225d0ff250269e12c9154a616aeb9 Mon Sep 17 00:00:00 2001
From: mmkal <mkal@Michaels-Mac-mini-2.local>
Date: Sun, 2 Jul 2017 22:07:06 -0400
Subject: [PATCH 250/287] revert some more bluebird changes

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

diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index e9a8924053..fcb273f5e2 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -1671,21 +1671,21 @@ s.transaction({
     });
 
 s.transaction( function() {
-    return Promise.resolve();
+    return Bluebird.resolve();
 } );
-s.transaction( { isolationLevel : 'SERIALIZABLE' }, function( t ) { return Promise.resolve(); } );
-s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.SERIALIZABLE }, (t) => Promise.resolve() );
-s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.READ_COMMITTED }, (t) => Promise.resolve() );
+s.transaction( { isolationLevel : 'SERIALIZABLE' }, function( t ) { return Bluebird.resolve(); } );
+s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.SERIALIZABLE }, (t) => Bluebird.resolve() );
+s.transaction( { isolationLevel : s.Transaction.ISOLATION_LEVELS.READ_COMMITTED }, (t) => Bluebird.resolve() );
 
 // transaction types
 new Sequelize( '', { transactionType: 'DEFERRED' } );
 new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.DEFERRED} );
 new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.IMMEDIATE} );
 new Sequelize( '', { transactionType: Sequelize.Transaction.TYPES.EXCLUSIVE} );
-s.transaction( { type : 'DEFERRED' }, (t) => Promise.resolve() );
-s.transaction( { type : s.Transaction.TYPES.DEFERRED }, (t) => Promise.resolve() );
-s.transaction( { type : s.Transaction.TYPES.IMMEDIATE }, (t) => Promise.resolve() );
-s.transaction( { type : s.Transaction.TYPES.EXCLUSIVE }, (t) => Promise.resolve() );
+s.transaction( { type : 'DEFERRED' }, (t) => Bluebird.resolve() );
+s.transaction( { type : s.Transaction.TYPES.DEFERRED }, (t) => Bluebird.resolve() );
+s.transaction( { type : s.Transaction.TYPES.IMMEDIATE }, (t) => Bluebird.resolve() );
+s.transaction( { type : s.Transaction.TYPES.EXCLUSIVE }, (t) => Bluebird.resolve() );
 
 // promise transaction
 s.transaction(async () => {
@@ -1693,8 +1693,8 @@ s.transaction(async () => {
 s.transaction((): Promise<void> => {
     return Promise.resolve();
 });
-s.transaction((): Promise<void> => {
-    return Promise.resolve();
+s.transaction((): Bluebird<void> => {
+    return Bluebird.resolve();
 });
 s.transaction((): Q.Promise<void> => {
     return Q.Promise<void>((resolve) => {

From d5aba66148f69167cdf22d7c858f5a7b5bc3f072 Mon Sep 17 00:00:00 2001
From: Gavin Sitthiampornphan <gavinsitti@hotmail.com>
Date: Mon, 3 Jul 2017 10:51:09 +0700
Subject: [PATCH 251/287] Types for error and warning should not be a string

From the [doc](http://redux-form.com/6.8.0/docs/api/Field.md/), error and warning are
> usually, but not necessarily, a String
---
 types/redux-form/lib/Field.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index d2439d87a6..ecef15b4c7 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -278,7 +278,7 @@ interface WrappedFieldMetaProps<S> {
      * The error for this field if its value is not passing validation. Both
      * synchronous, asynchronous, and submit validation errors will be reported here.
      */
-    error?: string;
+    error?: any;
 
     /**
      * The name of the form. Could be useful if you want to manually dispatch actions.
@@ -329,5 +329,5 @@ interface WrappedFieldMetaProps<S> {
     /**
      * The warning for this field if its value is not passing warning validation.
      */
-    warning?: string;
+    warning?: any;
 }

From 4d2e46305f58c94145e2404917693687bc89b03f Mon Sep 17 00:00:00 2001
From: Luigi Pinca <luigipinca@gmail.com>
Date: Mon, 3 Jul 2017 09:20:50 +0200
Subject: [PATCH 252/287] @types/ws: fix type of WebSocketServer#clients

Fixes: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14774
---
 types/ws/index.d.ts  | 2 +-
 types/ws/ws-tests.ts | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index 49ae4cfb3e..fc072727e8 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -155,7 +155,7 @@ declare namespace WebSocket {
     export class Server extends events.EventEmitter {
         options: IServerOptions;
         path: string;
-        clients: WebSocket[];
+        clients: Set<WebSocket>;
 
         constructor(options?: IServerOptions, callback?: Function);
 
diff --git a/types/ws/ws-tests.ts b/types/ws/ws-tests.ts
index 4da29311ee..90b0e6080f 100644
--- a/types/ws/ws-tests.ts
+++ b/types/ws/ws-tests.ts
@@ -34,9 +34,8 @@ import * as https from 'https';
 {
     var wss = new WebSocket.Server({port: 8082});
 
-    const broadcast = function(data: any) {
-        for(var i in wss.clients)
-            wss.clients[i].send(data);
+    const broadcast = (data: any) => {
+        wss.clients.forEach((ws) => ws.send(data));
     };
 }
 

From 9d17546a00d9cc51c8cc46a97186e45e30c31b37 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <nenadalm@gmail.com>
Date: Mon, 3 Jul 2017 13:54:03 +0200
Subject: [PATCH 253/287] [ramda]: More detailed isNil definition

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index cb0241bea7..e0fbd22d4a 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -813,7 +813,7 @@ declare namespace R {
         /**
          * Checks if the input value is null or undefined.
          */
-        isNil(value: any): boolean;
+        isNil(value: any): value is null | undefined;
 
         /**
          * Returns a string made by inserting the `separator` between each

From e97075f1ea2c1177feda67660d291b0251434847 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 3 Jul 2017 11:53:14 -0400
Subject: [PATCH 254/287] [react-native] Correct signatures for Flatlist
 ListEmptyComponent, ListFooterComponent, ListHeaderComponent

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index e1cc0daa3c..ed662e1c46 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3444,17 +3444,17 @@ export interface FlatListProperties<ItemT> extends ScrollViewProperties {
     /**
      * Rendered when the list is empty.
      */
-    ListEmptyComponent?: React.ComponentClass<any> | null
+    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | null
 
     /**
      * Rendered at the very end of the list.
      */
-    ListFooterComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null
+    ListFooterComponent?: React.ComponentClass<any> | React.ReactElement<any> | null
 
     /**
      * Rendered at the very beginning of the list.
      */
-    ListHeaderComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null
+    ListHeaderComponent?: React.ComponentClass<any> | React.ReactElement<any> | null
 
     /**
      * Optional custom style for multi-item rows generated when numColumns > 1

From 9ab3afa064b69ff1021acd80d47d9622976615cf Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 3 Jul 2017 12:02:07 -0400
Subject: [PATCH 255/287] [react-native] Add state type to React.Component
 generic

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index e1cc0daa3c..5a3df6dcb7 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -336,7 +336,7 @@ export interface NativeMethodsMixinStatic {
     blur(): void;
 
     refs: {
-        [key: string]: React.Component<any>
+        [key: string]: React.Component<any, any>
     };
 }
 
@@ -8858,7 +8858,7 @@ export function requireNativeComponent<P>(
     extraConfig?: {nativeOnly?: any}
 ): React.ComponentClass<P>;
 
-export function findNodeHandle(componentOrHandle: null | number | React.Component<any> | React.ComponentClass<any>): null | number;
+export function findNodeHandle(componentOrHandle: null | number | React.Component<any, any> | React.ComponentClass<any>): null | number;
 
 export function processColor(color: any): number;
 

From 366a37cd317f211a2d706461170e4082a45252f1 Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <deividas@quatrodev.com>
Date: Mon, 3 Jul 2017 20:17:34 +0300
Subject: [PATCH 256/287] ReactSwipe types added.

---
 types/react-swipe/index.d.ts    | 34 +++++++++++++++++++++++++++++++++
 types/react-swipe/tsconfig.json | 25 ++++++++++++++++++++++++
 types/react-swipe/tslint.json   |  1 +
 3 files changed, 60 insertions(+)
 create mode 100644 types/react-swipe/index.d.ts
 create mode 100644 types/react-swipe/tsconfig.json
 create mode 100644 types/react-swipe/tslint.json

diff --git a/types/react-swipe/index.d.ts b/types/react-swipe/index.d.ts
new file mode 100644
index 0000000000..304db816d2
--- /dev/null
+++ b/types/react-swipe/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for react-swipe 5.0
+// Project: https://github.com/voronianski/react-swipe
+// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="swipe" />
+
+import * as React from "react";
+
+declare class ReactSwipe extends React.Component<ReactSwipe.Props, {}> {
+    prev(): void;
+    next(): void;
+    getPos(): number;
+    getNumSlides(): number;
+    slide(index: number, duration: number): void;
+}
+
+declare namespace ReactSwipe {
+    interface Style {
+        container: React.CSSProperties;
+        wrapper: React.CSSProperties;
+        child: React.CSSProperties;
+    }
+
+    interface Props {
+        id?: string;
+        swipeOptions?: SwipeOptions;
+        style?: Style;
+        className?: string;
+    }
+}
+
+export = ReactSwipe;
diff --git a/types/react-swipe/tsconfig.json b/types/react-swipe/tsconfig.json
new file mode 100644
index 0000000000..304ae7e451
--- /dev/null
+++ b/types/react-swipe/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [
+        ],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-swipe-tests.tsx"
+    ]
+}
diff --git a/types/react-swipe/tslint.json b/types/react-swipe/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-swipe/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 031688dbfce4491fb744240c52609636c7649140 Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <deividas@quatrodev.com>
Date: Mon, 3 Jul 2017 20:17:49 +0300
Subject: [PATCH 257/287] ReactSwipe tests added.

---
 types/react-swipe/react-swipe-tests.tsx | 75 +++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 types/react-swipe/react-swipe-tests.tsx

diff --git a/types/react-swipe/react-swipe-tests.tsx b/types/react-swipe/react-swipe-tests.tsx
new file mode 100644
index 0000000000..fed2c2d3b5
--- /dev/null
+++ b/types/react-swipe/react-swipe-tests.tsx
@@ -0,0 +1,75 @@
+import * as React from "react";
+import * as ReactSwipe from "react-swipe";
+
+class ReactSwipeTest extends React.PureComponent {
+    private swipeComponent: ReactSwipe | null = null;
+
+    private onPrev: React.MouseEventHandler<HTMLButtonElement> = () => {
+        if (this.swipeComponent != null) {
+            this.swipeComponent.prev();
+        }
+    }
+
+    private onNext: React.MouseEventHandler<HTMLButtonElement> = () => {
+        if (this.swipeComponent != null) {
+            this.swipeComponent.next();
+        }
+    }
+
+    private onSlideToStart: React.MouseEventHandler<HTMLButtonElement> = () => {
+        if (this.swipeComponent != null) {
+            const lastSlide = this.swipeComponent.getNumSlides() - 1;
+            this.swipeComponent.slide(lastSlide, 1000);
+        }
+    }
+
+    private onGetCurrentPosition: React.MouseEventHandler<HTMLButtonElement> = () => {
+        let currentPosition: number;
+
+        if (this.swipeComponent != null) {
+            currentPosition = this.swipeComponent.getPos();
+        } else {
+            currentPosition = 0;
+        }
+
+        alert(currentPosition);
+    }
+
+    render() {
+        const swipeOptions: SwipeOptions = {
+            auto: 12,
+            disableScroll: true,
+            stopPropagation: true
+        };
+
+        const style: ReactSwipe.Style = {
+            child: {
+                backgroundColor: "yellow"
+            },
+            container: {
+                backgroundColor: "green"
+            },
+            wrapper: {
+                backgroundColor: "red"
+            }
+        };
+
+        return <div>
+            <ReactSwipe
+                className="carousel"
+                id="test-carousel"
+                swipeOptions={swipeOptions}
+                style={style}
+                ref={(swipeComponent) => { this.swipeComponent = swipeComponent; }}
+            >
+                <div>PANE 1</div>
+                <div>PANE 2</div>
+                <div>PANE 3</div>
+            </ReactSwipe>
+            <button onClick={this.onPrev}>Prev</button>
+            <button onClick={this.onNext}>Next</button>
+            <button onClick={this.onSlideToStart}>Slide to end</button>
+            <button onClick={this.onGetCurrentPosition}>Get current position</button>
+        </div>;
+    }
+}

From 2b525047034b8af3f4b3d9a8bc19bd57a172d0b5 Mon Sep 17 00:00:00 2001
From: Andreas Krohn <andreas.krohn@kraftvaerk.com>
Date: Mon, 3 Jul 2017 20:42:05 +0200
Subject: [PATCH 258/287] Added missing callbacks

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

diff --git a/types/swiper/index.d.ts b/types/swiper/index.d.ts
index e16c7d5cc5..efd2c591d8 100644
--- a/types/swiper/index.d.ts
+++ b/types/swiper/index.d.ts
@@ -193,6 +193,10 @@ interface SwiperOptions {
     onLazyImageLoad?(swiper: Swiper, slide: any, image: any): void;
     onLazyImageReady?(swiper: Swiper, slide: any, image: any): void;
     onPaginationRendered?(swiper: Swiper, paginationContainer: any): void;
+    onScroll?(swiper: Swiper, event: Event): void;
+    onBeforeResize?(swiper: Swiper): void;
+    onAfterResize?(swiper: Swiper): void;
+    onKeyPress?(swiper: Swiper, kc: any): void;
 
     // Namespace
     slideClass?: string;

From a99764c7698d264a1212f734e319d35e024a779e Mon Sep 17 00:00:00 2001
From: Andreas Krohn <andreas.krohn@kraftvaerk.com>
Date: Mon, 3 Jul 2017 20:42:26 +0200
Subject: [PATCH 259/287] Added `virtualSize` as property

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

diff --git a/types/swiper/index.d.ts b/types/swiper/index.d.ts
index efd2c591d8..f79c4ce7ca 100644
--- a/types/swiper/index.d.ts
+++ b/types/swiper/index.d.ts
@@ -241,6 +241,7 @@ declare class Swiper {
     height: number;
     params: any;
     positions: any;
+    virtualSize: number;
 
     // Feature detection
     support: {

From 87b1ae55d98ee50098507a77076273dd1e5bec22 Mon Sep 17 00:00:00 2001
From: Andreas Krohn <andreas.krohn@kraftvaerk.com>
Date: Mon, 3 Jul 2017 20:55:57 +0200
Subject: [PATCH 260/287] Added wrapper property

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

diff --git a/types/swiper/index.d.ts b/types/swiper/index.d.ts
index f79c4ce7ca..57edc39a61 100644
--- a/types/swiper/index.d.ts
+++ b/types/swiper/index.d.ts
@@ -241,6 +241,7 @@ declare class Swiper {
     height: number;
     params: any;
     positions: any;
+    wrapper: any;
     virtualSize: number;
 
     // Feature detection

From e5f1296ee484544c0096b9f0b7d0466b9477566e Mon Sep 17 00:00:00 2001
From: Nate Silva <nate@natesilva.com>
Date: Mon, 3 Jul 2017 13:15:50 -0700
Subject: [PATCH 261/287] support `timestamps` option on
 `AssociationOptionsBelongsToMany`

as documented at http://docs.sequelizejs.com/class/lib/model.js~Model.html#static-method-belongsToMany
---
 types/sequelize/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index c227e13d55..88296b8215 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1355,6 +1355,11 @@ declare namespace sequelize {
          */
         otherKey?: string | AssociationForeignKeyOptions;
 
+        /**
+         * Should the join model have timestamps
+         */
+        timestamps?: boolean;
+
     }
 
     /**

From 5f081bc7b48cce8d6947b96c0c9c1d88e456c5b4 Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 3 Jul 2017 17:42:47 -0400
Subject: [PATCH 262/287] Add `onerror` and `runInDebug` to Ember typings.

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

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 07a8a0d54f..41f8fe6d45 100644
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -2449,6 +2449,7 @@ declare namespace Ember {
     function observersFor(obj: any, path: string): any[];
     function onLoad(name: string, callback: Function): void;
     const onError: Error;
+    function onerror(error: any): void;
     function overrideChains(obj: any, keyName: string, m: any): boolean;
     // ReSharper disable once DuplicatingLocalDeclaration
     const platform: {
@@ -2480,6 +2481,7 @@ declare namespace Ember {
         throttle(target: any, method: Function | string, ...args: any[]): void;
         queues: any[];
     };
+    function runInDebug(fn: Function): void;
     function runLoadHooks(name: string, object: any): void;
     function sendEvent(obj: any, eventName: string, params?: any[], actions?: any[]): boolean;
     function set(obj: any, keyName: string, value: any): any;

From 48df7f24d75d66b6313058c16ede7a4513e3104d Mon Sep 17 00:00:00 2001
From: Jason Wu <jason.a.wu@accenture.com>
Date: Tue, 4 Jul 2017 01:08:50 -0500
Subject: [PATCH 263/287] Overloaded functions to support the moveVector
 parameter for the 'dragMove' and 'pointerMove' events

---
 types/draggabilly/index.d.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/types/draggabilly/index.d.ts b/types/draggabilly/index.d.ts
index f376ea8fbd..6307c424ab 100644
--- a/types/draggabilly/index.d.ts
+++ b/types/draggabilly/index.d.ts
@@ -16,19 +16,26 @@ export interface DraggabillyOptions {
     handle?: string;
 }
 
-export type DraggabillyEventName = 'dragStart' | 'dragMove' | 'dragEnd' | 'pointerDown' | 'pointerMove' | 'pointerUp'
-    | 'staticClick';
+export type DraggabillyClickEventName = 'dragStart' | 'dragEnd' | 'pointerDown' | 'pointerUp' | 'staticClick';
+
+export type DraggabillyMoveEventName = 'dragMove' | 'pointerMove';
 
 export default class Draggabilly {
     position: Position;
 
     constructor(element: Element | string, options?: DraggabillyOptions);
 
-    on(eventName: DraggabillyEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): Draggabilly;
+    on(eventName: DraggabillyClickEventName, listener: (event: Event, pointer: MouseEvent | Touch) => void): Draggabilly;
 
-    off(eventName: DraggabillyEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): Draggabilly;
+    on(eventName: DraggabillyMoveEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): Draggabilly;
 
-    once(eventName: DraggabillyEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector?: Position) => void): Draggabilly;
+    off(eventName: DraggabillyClickEventName, listener: (event: Event, pointer: MouseEvent | Touch) => void): Draggabilly;
+
+    off(eventName: DraggabillyMoveEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): Draggabilly;
+
+    once(eventName: DraggabillyClickEventName, listener: (event: Event, pointer: MouseEvent | Touch) => void): Draggabilly;
+
+    once(eventName: DraggabillyMoveEventName, listener: (event: Event, pointer: MouseEvent | Touch, moveVector: Position) => void): Draggabilly;
 
     enable(): void;
 

From 3a78509fb0f1508f8523466810694d4f788fbb99 Mon Sep 17 00:00:00 2001
From: huhuanming <workboring@gmail.com>
Date: Tue, 4 Jul 2017 15:57:10 +0800
Subject: [PATCH 264/287] Detailed Types In Block

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

diff --git a/types/react-native-touch-id/index.d.ts b/types/react-native-touch-id/index.d.ts
index 04f7fbbfde..f1fc4f7a71 100644
--- a/types/react-native-touch-id/index.d.ts
+++ b/types/react-native-touch-id/index.d.ts
@@ -13,6 +13,6 @@ declare module 'react-native-touch-id' {
     details: any;
   }
 
-  export const isSupported: () => Promise<boolean | string>;
+  export const isSupported: () => Promise<boolean | TouchIDError>;
   export const authenticate: (reason: string) => Promise<boolean | TouchIDError>;
 }
diff --git a/types/react-native-touch-id/react-native-touch-id-tests.ts b/types/react-native-touch-id/react-native-touch-id-tests.ts
index 009f1c347f..0b431ecc85 100644
--- a/types/react-native-touch-id/react-native-touch-id-tests.ts
+++ b/types/react-native-touch-id/react-native-touch-id-tests.ts
@@ -1,5 +1,5 @@
-import { isSupported, authenticate } from 'react-native-touch-id';
+import { isSupported, authenticate, TouchIDError } from 'react-native-touch-id';
 
-isSupported().then(() => {}).catch(() => {});
+isSupported().then((isOk: boolean) => {}).catch((error: TouchIDError) => {});
 
-authenticate('reason').then(() => {}).catch(() => {});
+authenticate('reason').then((isOk: boolean) => {}).catch((error: TouchIDError) => {});

From cab8d0e70e0f06e66f57d1131af4b23716910cc3 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <nenadalm@gmail.com>
Date: Tue, 4 Jul 2017 10:10:09 +0200
Subject: [PATCH 265/287] [ramda]: Add forEachObjIndexed definition

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index e0fbd22d4a..35b74de5f2 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -628,6 +628,12 @@ declare namespace R {
         forEach<T>(fn: (x: T) => void, list: T[]): T[];
         forEach<T>(fn: (x: T) => void): (list: T[]) => T[];
 
+        /**
+         * Iterate over an input object, calling a provided function fn for each key and value in the object.
+         */
+        forEachObjIndexed<T>(fn: (value: T[keyof T], key: keyof T, obj: T) => void, obj: T): T;
+        forEachObjIndexed<T>(fn: (value: T[keyof T], key: keyof T, obj: T) => void): (obj: T) => T;
+
         /**
          * Creates a new object out of a list key-value pairs.
          */

From 328d2c268faf567bb1a38964042d690eb40f6906 Mon Sep 17 00:00:00 2001
From: Jeremi Stadler <stadler.jeremi@gmail.com>
Date: Tue, 4 Jul 2017 11:24:25 +0200
Subject: [PATCH 266/287] [React-Native] Remove me from maintainer list

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 5a3df6dcb7..bef9e7afea 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Eloy Durán <https://github.com/alloy>
 //                 Fedor Nezhivoi <https://github.com/gyzerok>
 //                 HuHuanming <https://github.com/huhuanming>
-//                 Jeremi Stadler <https://github.com/jeremistadler>
 //                 Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3

From acc192069ecc8ddd7bd8d214f7916bf3a98b1fa0 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <nenadalm@gmail.com>
Date: Tue, 4 Jul 2017 14:06:50 +0200
Subject: [PATCH 267/287] [ramda]: Add startsWith definition

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 35b74de5f2..e30c95f8be 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1508,6 +1508,12 @@ declare namespace R {
         splitWhen<T, U>(pred: (val: T) => boolean, list: U[]): U[][];
         splitWhen<T>(pred: (val: T) => boolean): <U>(list: U[]) => U[][];
 
+        /**
+         * Checks if a list starts with the provided values
+         */
+        startsWith(a: any, list: any): boolean;
+        startsWith(a: any): (list: any) => boolean;
+
         /**
          * Subtracts two numbers. Equivalent to `a - b` but curried.
          */

From e23ee8a8dd5c5909ceae48eb23a48d58e443a795 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Tue, 4 Jul 2017 23:55:07 +0800
Subject: [PATCH 268/287] fix(cheerio): CheerioAPI should extend CheerioStatic

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

diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index 4096a0f9c2..f525a46ee6 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -263,7 +263,7 @@ interface CheerioElement {
     nodeValue: string;
 }
 
-interface CheerioAPI extends CheerioSelector {
+interface CheerioAPI extends CheerioSelector, CheerioStatic {
   load(html: string, options?: CheerioOptionsInterface): CheerioStatic;
   load(element: CheerioElement, options?: CheerioOptionsInterface): CheerioStatic;
 }

From 98fdc33a5308775c27a83b8d1469ba9ee4739126 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Tue, 4 Jul 2017 23:57:48 +0800
Subject: [PATCH 269/287] test(cheerio): add tests

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

diff --git a/types/cheerio/cheerio-tests.ts b/types/cheerio/cheerio-tests.ts
index 1c0848eef7..4a15f029f0 100644
--- a/types/cheerio/cheerio-tests.ts
+++ b/types/cheerio/cheerio-tests.ts
@@ -306,3 +306,5 @@ $.parseHTML(html, null, true);
  * Not in doc
  */
 $el.toArray();
+
+cheerio.html($el);

From 642aa347d7340a6c2d1f6ffbc0df657863663104 Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <deividas@quatrodev.com>
Date: Tue, 4 Jul 2017 19:33:31 +0300
Subject: [PATCH 270/287] `tslint.json` and `tsconfig.json` added.

---
 types/react-tooltip/tsconfig.json | 25 +++++++++++++++++++++++++
 types/react-tooltip/tslint.json   |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 types/react-tooltip/tsconfig.json
 create mode 100644 types/react-tooltip/tslint.json

diff --git a/types/react-tooltip/tsconfig.json b/types/react-tooltip/tsconfig.json
new file mode 100644
index 0000000000..d52b7c28ab
--- /dev/null
+++ b/types/react-tooltip/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom",
+            "dom.iterable"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-tooltip-tests.tsx"
+    ]
+}
diff --git a/types/react-tooltip/tslint.json b/types/react-tooltip/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-tooltip/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d1f0c60277735137b08e780f2e787b9ecbb3b3cb Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <deividas@quatrodev.com>
Date: Tue, 4 Jul 2017 19:43:24 +0300
Subject: [PATCH 271/287] `react-tooltip` types added.

---
 types/react-tooltip/index.d.ts | 54 ++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 types/react-tooltip/index.d.ts

diff --git a/types/react-tooltip/index.d.ts b/types/react-tooltip/index.d.ts
new file mode 100644
index 0000000000..67c7635752
--- /dev/null
+++ b/types/react-tooltip/index.d.ts
@@ -0,0 +1,54 @@
+// Type definitions for react-tooltip 3.3
+// Project: https://github.com/wwayne/react-tooltip
+// Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from "react";
+
+declare class ReactTooltip extends React.Component<ReactTooltip.Props> { }
+
+declare namespace ReactTooltip {
+    interface Offset {
+        top?: number;
+        right?: number;
+        left?: number;
+        bottom?: number;
+    }
+
+    type ElementEvents = keyof HTMLElementEventMap;
+    type WindowEvents = keyof WindowEventMap;
+
+    type GetContentCallback = () => React.ReactNode;
+    type GetContent = GetContentCallback | [GetContentCallback, number];
+
+    interface Props {
+        id?: string;
+        place?: "top" | "right" | "bottom" | "left";
+        type?: "success" | "warning" | "error" | "info" | "light";
+        effect?: "float" | "solid";
+        event?: ElementEvents;
+        eventOff?: ElementEvents;
+        globalEventOff?: WindowEvents;
+        isCapture?: boolean;
+        offset?: Offset;
+        multiline?: boolean;
+        className?: string;
+        html?: boolean;
+        delayHide?: number;
+        delayShow?: number;
+        insecure?: boolean;
+        border?: boolean;
+        getContent?: GetContent;
+        afterShow?(): void;
+        afterHide?(): void;
+        disable?: boolean;
+        scrollHide?: boolean;
+        resizeHide?: boolean;
+        wrapper?: "div" | "span";
+        role?: string;
+        class?: string;
+        watchWindow?: boolean;
+    }
+}
+
+export = ReactTooltip;

From 9bbcff9c8c55c972d2067782610e901d44fb1b37 Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <deividas@quatrodev.com>
Date: Tue, 4 Jul 2017 19:51:15 +0300
Subject: [PATCH 272/287] React tooltip tests added.

---
 types/react-tooltip/react-tooltip-tests.tsx | 79 +++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 types/react-tooltip/react-tooltip-tests.tsx

diff --git a/types/react-tooltip/react-tooltip-tests.tsx b/types/react-tooltip/react-tooltip-tests.tsx
new file mode 100644
index 0000000000..7fa5332f27
--- /dev/null
+++ b/types/react-tooltip/react-tooltip-tests.tsx
@@ -0,0 +1,79 @@
+import * as React from "react";
+import * as ReactTooltip from "react-tooltip";
+
+export class ReactTooltipTest extends React.PureComponent {
+    render() {
+        const getContent: ReactTooltip.GetContent = [() => Math.floor(Math.random() * 100), 30];
+
+        return <div>
+            <a data-tip data-for="happyFace"> d(`･∀･)b </a>
+            <ReactTooltip id="happyFace" type="error">
+                <span>Show happy face</span>
+            </ReactTooltip>
+
+            <a data-tip data-for="sadFace"> இдஇ </a>
+            <ReactTooltip id="sadFace" type="warning" effect="solid" afterHide={() => { console.log("afterHide"); }}>
+                <span>Show sad face</span>
+            </ReactTooltip>
+
+            <a data-tip data-for="global"> σ`∀´)σ </a>
+            <a data-tip data-for="global"> (〃∀〃) </a>
+            <ReactTooltip id="global" aria-haspopup="true" role="example" afterShow={() => { console.log("afterShow"); }}>
+                <p>This is a global react component tooltip</p>
+                <p>You can put every thing here</p>
+                <ul>
+                    <li>Word</li>
+                    <li>Chart</li>
+                    <li>Else</li>
+                </ul>
+            </ReactTooltip>
+
+            <a data-tip="custom show" data-event="click focus">( •̀д•́)</a>
+            <ReactTooltip globalEventOff="click" place="top" />
+
+            <a data-tip="custom show and hide" data-event="click" data-event-off="dblclick">( •̀д•́)</a>
+            <ReactTooltip />
+
+            <a data-tip="hover on me will keep the tootlip">(･ω´･ )́)</a>
+            <ReactTooltip class="extraClass" delayHide={1000} effect="solid" />
+
+            <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-tip data-for="happyFace"> d(`･∀･)b </a>
+            <ReactTooltip
+                id="happyFace"
+                type="error"
+                event="click"
+                eventOff="dblclick"
+                globalEventOff="dblclick"
+                isCapture={true}
+                offset={{
+                    left: 100,
+                    bottom: 30
+                }}
+                multiline={true}
+                className="custom-class-name"
+                html={true}
+                delayShow={100}
+                delayHide={100}
+                insecure={true}
+                disable={false}
+                scrollHide={true}
+                resizeHide={true}
+                watchWindow={true}
+            >
+                <span>
+                    Show happy face
+                </span>
+                <br />
+                <span>
+                    Show happy face
+                </span>
+            </ReactTooltip>
+        </div>;
+    }
+}

From bea2afe988c283c664ad376b60b1ae858a00f00b Mon Sep 17 00:00:00 2001
From: Deividas Bakanas <deividas@quatrodev.com>
Date: Tue, 4 Jul 2017 20:10:25 +0300
Subject: [PATCH 273/287] Typescript version defined.

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

diff --git a/types/react-tooltip/index.d.ts b/types/react-tooltip/index.d.ts
index 67c7635752..c4c380f533 100644
--- a/types/react-tooltip/index.d.ts
+++ b/types/react-tooltip/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/wwayne/react-tooltip
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from "react";
 

From 00215dc7a43cb343017000bd87efe8a0c578ce0b Mon Sep 17 00:00:00 2001
From: Daniel Chao <daniel.h.chao@gmail.com>
Date: Tue, 4 Jul 2017 11:43:10 -0700
Subject: [PATCH 274/287] add subscribe and unsubscribe methods to peripherals

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

diff --git a/types/noble/index.d.ts b/types/noble/index.d.ts
index 4f2b5f0b7c..d62b0609a8 100644
--- a/types/noble/index.d.ts
+++ b/types/noble/index.d.ts
@@ -4,6 +4,7 @@
 //                 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>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -88,6 +89,8 @@ export declare class Characteristic extends events.EventEmitter {
     notify(notify: boolean, callback?: (error: string) => void): void;
     discoverDescriptors(callback?: (error: string, descriptors: Descriptor[]) => void): void;
     toString(): string;
+    subscribe(callback?: (error: string) => void): void;
+    unsubscribe(callback?: (error: string) => void): void;
 
     on(event: string, listener: Function): this;
     on(event: string, option: boolean, listener: Function): this;
diff --git a/types/noble/noble-tests.ts b/types/noble/noble-tests.ts
index baa65c5662..c790f2deb0 100644
--- a/types/noble/noble-tests.ts
+++ b/types/noble/noble-tests.ts
@@ -87,6 +87,10 @@ characteristic.on("write", true, (error: string): void => {});
 characteristic.on("broadcast", (state: string): void => {});
 characteristic.on("notify", (state: string): void => {});
 characteristic.on("descriptorsDiscover", (descriptors: noble.Descriptor[]): void => {});
+characteristic.subscribe();
+characteristic.subscribe((error: string) => {});
+characteristic.unsubscribe();
+characteristic.unsubscribe((error: string) => {});
 
 var descriptor: noble.Descriptor = new noble.Descriptor();
 descriptor.uuid = "";

From 93109f126a2e0079ff823a0fffe74369d3e8a82d Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Tue, 4 Jul 2017 16:10:19 -0400
Subject: [PATCH 275/287] Added definitions for react-native-elements

---
 types/react-native-elements/index.d.ts        | 166 ++++++++++++++++++
 .../react-native-elements-tests.tsx           |  44 +++++
 types/react-native-elements/tsconfig.json     |  24 +++
 types/react-native-elements/tslint.json       |   1 +
 4 files changed, 235 insertions(+)
 create mode 100644 types/react-native-elements/index.d.ts
 create mode 100644 types/react-native-elements/react-native-elements-tests.tsx
 create mode 100644 types/react-native-elements/tsconfig.json
 create mode 100644 types/react-native-elements/tslint.json

diff --git a/types/react-native-elements/index.d.ts b/types/react-native-elements/index.d.ts
new file mode 100644
index 0000000000..8323ef1c25
--- /dev/null
+++ b/types/react-native-elements/index.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for react-native-elements 0.13
+// Project: https://github.com/react-native-training/react-native-elements#readme
+// Definitions by: Kyle Roach <https://github.com/iRoachie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+import { ViewStyle, TextStyle } from 'react-native';
+
+export interface ButtonIcon {
+    name?: string;
+    color?: string;
+    size?: number;
+    type?: 'material' | 'material-community' | 'simple-line-icon' | 'zocial' | 'font-awesome' | 'octicon' | 'ionicon' | 'foundation' | 'evilicon' | 'entypo';
+    buttonStyle?: TextStyle;
+}
+
+export interface ButtonProperties {
+    /**
+     * Specify other component such as TouchableOpacity or other
+     *
+     * @default TouchableHighlight (iOS), TouchableNativeFeedback (android)
+     */
+    Component?: JSX.Element;
+
+    /**
+     * Additional styling for button component
+     *
+     * @default null
+     */
+    buttonStyle?: ViewStyle;
+
+    /**
+     * Button title
+     */
+    title: string;
+
+    /**
+     * Makes button large
+     *
+     * @default false
+     */
+    large?: boolean;
+
+    /**
+     * Specify different font family
+     *
+     * @default System font (iOS), Sans Serif (android)
+     */
+    fontFamily?: string;
+
+    /**
+     * Specify font weight for title
+     *
+     * @default null
+     */
+    fontWeight?: string;
+
+    /**
+     * Moves icon to right of title
+     *
+     * @default false
+     */
+    iconRight?: boolean;
+
+    /**
+     * onPress method
+     */
+    onPress(): void;
+
+    /**
+     * onLongPress method
+     */
+    onLongPress?(): void;
+
+    /**
+     * Icon configuration
+     */
+    icon?: ButtonIcon;
+
+    /**
+     * Specify other icon component instead of default. The component will have all values from the icon prop
+     *
+     * @default MaterialIcon
+     * @see https://github.com/oblador/react-native-vector-icons#icon-component
+     */
+    iconComponent?: JSX.Element;
+
+    /**
+     * Background color of button
+     *
+     * @default #397af8
+     */
+    backgroundColor?: string;
+
+    /**
+     * Adds border radius to button
+     *  (Note: if you set this, don't forget to also set borderRadius to containerViewStyle prop, otherwise unexpected behaviour might occur)
+     *
+     * @default 0
+     */
+    borderRadius?: number;
+
+    /**
+     * Font color
+     *
+     * @default #fff
+     */
+    color?: string;
+
+    /**
+     * Text styling
+     *
+     * @default null
+     */
+    textStyle?: TextStyle;
+
+    /**
+     * Font size
+     *
+     * @default 18
+     */
+    fontSize?: number;
+
+    /**
+     * Underlay color for button press
+     *
+     * @default transparent
+     */
+    underlayColor?: string;
+
+    /**
+     * Flag to add raised button styling
+     *
+     * @default false
+     */
+    raised?: boolean;
+
+    /**
+     * Indicates button is disabled
+     *
+     * @default false
+     */
+    disabled?: boolean;
+
+    /**
+     * Disabled button styling
+     *
+     * @default null
+     */
+    disabledStyle?: ViewStyle;
+
+    /**
+     * Styling for Component container
+     *
+     * @default null
+     */
+    containerViewStyle?: ViewStyle;
+}
+
+/**
+ * Button component
+ *
+ * @desc https://react-native-training.github.io/react-native-elements/API/buttons/
+ */
+export class Button extends React.Component<ButtonProperties, any> {}
diff --git a/types/react-native-elements/react-native-elements-tests.tsx b/types/react-native-elements/react-native-elements-tests.tsx
new file mode 100644
index 0000000000..197b1ec202
--- /dev/null
+++ b/types/react-native-elements/react-native-elements-tests.tsx
@@ -0,0 +1,44 @@
+import * as React from 'react';
+import { View, StyleSheet } from 'react-native';
+import { Button } from 'react-native-elements';
+
+class ButtonTest extends React.Component<any, any> {
+  handleButtonPress() {
+    console.log('I got pressed');
+  }
+
+  render() {
+    return (
+      <View>
+        <Button title='BUTTON' onPress={() => this.handleButtonPress()} />
+
+        <Button
+          raised
+          icon={{name: 'cached'}}
+          title='BUTTON WITH ICON' onPress={() => this.handleButtonPress()} />
+
+        <Button
+          large
+          iconRight
+          icon={{name: 'code'}}
+          title='LARGE WITH RIGHT ICON' onPress={() => this.handleButtonPress()} />
+
+        <Button
+          large
+          icon={{name: 'envira', type: 'font-awesome'}}
+          title='LARGE WITH RIGHT ICON' onPress={() => this.handleButtonPress()} />
+
+        <Button
+          large
+          icon={{name: 'squirrel', type: 'octicon', buttonStyle: styles.someButtonStyle }}
+          title='OCTICON' onPress={() => this.handleButtonPress()} />
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+  someButtonStyle: {
+    color: 'pink'
+  }
+});
diff --git a/types/react-native-elements/tsconfig.json b/types/react-native-elements/tsconfig.json
new file mode 100644
index 0000000000..52ea75b5cb
--- /dev/null
+++ b/types/react-native-elements/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-elements-tests.tsx"
+    ]
+}
diff --git a/types/react-native-elements/tslint.json b/types/react-native-elements/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-elements/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2f8f2a63211e92a2a5dc4360b8b28b0add982864 Mon Sep 17 00:00:00 2001
From: Lei Zhao <leizha@uber.com>
Date: Tue, 4 Jul 2017 13:30:23 -0700
Subject: [PATCH 276/287] Pool.end() accepts an optional callback param

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

diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index 2b442b1227..6718fb3f12 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -71,7 +71,7 @@ export declare class Pool extends events.EventEmitter {
     connect(): Promise<Client>;
     connect(callback: (err: Error, client: Client, done: () => void) => void): void;
 
-    end(): Promise<void>;
+    end(callback?: () => void): Promise<void>;
 
     query(queryStream: QueryConfig & stream.Readable): stream.Readable;
     query(queryTextOrConfig: string | QueryConfig): Promise<QueryResult>;
diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts
index 73c18ac1b7..4b4cfba7ec 100644
--- a/types/pg/pg-tests.ts
+++ b/types/pg/pg-tests.ts
@@ -74,3 +74,8 @@ pool.connect((err, client, done) => {
 pool.on('error', (err, client) => {
   console.error('idle client error', err.message, err.stack)
 })
+
+pool.end();
+pool.end(() => {
+    console.log("pool is closed");
+});

From dd09ab28f3cc99884e9376012abfa2be8e0736f5 Mon Sep 17 00:00:00 2001
From: Franklin Yu <franklinyu@hotmail.com>
Date: Tue, 4 Jul 2017 18:14:11 -0400
Subject: [PATCH 277/287] [gapi.auth2] mark a parameter as optional

According to the [documentation][], this parameter is optional.

[documentation]: https://developers.google.com/identity/sign-in/web/reference#googleauthgrantofflineaccessoptions
---
 types/gapi.auth2/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/gapi.auth2/index.d.ts b/types/gapi.auth2/index.d.ts
index 04dfe32c2d..6e9e5c4199 100644
--- a/types/gapi.auth2/index.d.ts
+++ b/types/gapi.auth2/index.d.ts
@@ -47,7 +47,7 @@ declare namespace gapi.auth2 {
     /**
      * Get permission from the user to access the specified scopes offline.
      */
-    grantOfflineAccess(options: {
+    grantOfflineAccess(options?: {
       scope?: string;
       prompt?: "select_account" | "consent";
       app_package_name?: string;

From e75065c4ff95b6c60956e2fc5e7ab7e285a6bfac Mon Sep 17 00:00:00 2001
From: Kyle <kroach.work@gmail.com>
Date: Wed, 5 Jul 2017 00:01:22 -0400
Subject: [PATCH 278/287] Add render function to Flatlist union

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index ed662e1c46..5312be9362 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3444,17 +3444,17 @@ export interface FlatListProperties<ItemT> extends ScrollViewProperties {
     /**
      * Rendered when the list is empty.
      */
-    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | null
+    ListEmptyComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
 
     /**
      * Rendered at the very end of the list.
      */
-    ListFooterComponent?: React.ComponentClass<any> | React.ReactElement<any> | null
+    ListFooterComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
 
     /**
      * Rendered at the very beginning of the list.
      */
-    ListHeaderComponent?: React.ComponentClass<any> | React.ReactElement<any> | null
+    ListHeaderComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null
 
     /**
      * Optional custom style for multi-item rows generated when numColumns > 1

From 26ed016814acc9b5a8c0b2f95e08b8f89bf3a9c8 Mon Sep 17 00:00:00 2001
From: Savva Surenkov <savva.surenkov@outlook.com>
Date: Sat, 1 Jul 2017 17:23:18 +1000
Subject: [PATCH 279/287] [jsonp] add jsonp typings

---
 types/jsonp/index.d.ts     | 19 +++++++++++++++++++
 types/jsonp/jsonp-tests.ts | 28 ++++++++++++++++++++++++++++
 types/jsonp/tsconfig.json  | 21 +++++++++++++++++++++
 types/jsonp/tslint.json    |  6 ++++++
 4 files changed, 74 insertions(+)
 create mode 100644 types/jsonp/index.d.ts
 create mode 100644 types/jsonp/jsonp-tests.ts
 create mode 100644 types/jsonp/tsconfig.json
 create mode 100644 types/jsonp/tslint.json

diff --git a/types/jsonp/index.d.ts b/types/jsonp/index.d.ts
new file mode 100644
index 0000000000..3f1df60c87
--- /dev/null
+++ b/types/jsonp/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for jsonp 0.2
+// Project: https://github.com/LearnBoost/jsonp
+// Definitions by: Savva Surenkov <https://github.com/surenkov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = jsonp;
+
+declare function jsonp(url: string, options?: Options, cb?: RequestCallback): CancelFn;
+declare function jsonp(url: string, callback?: RequestCallback): CancelFn;
+
+type CancelFn = () => void;
+type RequestCallback = (error: Error | null, data: any) => void;
+
+interface Options {
+    param?: string;
+    prefix?: string;
+    name?: string;
+    timeout?: number;
+}
diff --git a/types/jsonp/jsonp-tests.ts b/types/jsonp/jsonp-tests.ts
new file mode 100644
index 0000000000..703e104912
--- /dev/null
+++ b/types/jsonp/jsonp-tests.ts
@@ -0,0 +1,28 @@
+import jsonp = require('jsonp');
+
+/**
+ * Dummy response callback.
+ */
+const print = (err: Error | null, data: any) =>
+    console.log(err !== null ? err.message : data);
+
+/**
+ * Tests jsonp request with default parameters.
+ */
+const cancel1 = jsonp('https://jsonplaceholder.typicode.com/posts/1', print);
+cancel1();
+
+/**
+ * Tests parametrized jsonp request.
+ */
+const cancel2 = jsonp(
+    'https://jsonplaceholder.typicode.com/posts/1',
+    {
+        param: 'cb',
+        timeout: 40000,
+        prefix: '_jsonp',
+        name: 'func',
+    },
+    print,
+);
+cancel2();
diff --git a/types/jsonp/tsconfig.json b/types/jsonp/tsconfig.json
new file mode 100644
index 0000000000..4ba94d9d89
--- /dev/null
+++ b/types/jsonp/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsonp-tests.ts"
+    ]
+}
diff --git a/types/jsonp/tslint.json b/types/jsonp/tslint.json
new file mode 100644
index 0000000000..a62d0d4e68
--- /dev/null
+++ b/types/jsonp/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false
+    }
+}

From 9a46932a1265e8bcd73063a075256a5011d42f88 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Wed, 5 Jul 2017 11:32:02 -0400
Subject: [PATCH 280/287] [react-native-elements] Added HTML Style
 Headings(Text) Component, and checklist

---
 types/react-native-elements/README.md         | 27 +++++++++++++
 types/react-native-elements/index.d.ts        | 39 +++++++++++++++++++
 .../react-native-elements-tests.tsx           | 15 ++++++-
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 types/react-native-elements/README.md

diff --git a/types/react-native-elements/README.md b/types/react-native-elements/README.md
new file mode 100644
index 0000000000..0ed43c6eb3
--- /dev/null
+++ b/types/react-native-elements/README.md
@@ -0,0 +1,27 @@
+# [React Native Elements](https://github.com/react-native-training/react-native-elements)
+
+### Component Checklist
+List will update as typings are added
+
+- [x] Buttons
+- [ ] Badge
+- [ ] Social Icons / Social Icon Buttons
+- [ ] Icons
+- [ ] Side Menu
+- [ ] Form Elements
+- [ ] Search Bar
+- [ ] ButtonGroup
+- [ ] Checkboxes
+- [ ] List Element
+- [ ] Badge
+- [ ] Tab Bar Component
+- [x] HTML style headings
+- [ ] Card component
+- [ ] Pricing Component
+- [ ] Grid Component
+- [ ] Slider Component
+- [ ] Tile Component
+- [ ] Avatar Component
+- [ ] Rating Component
+- [ ] SwipeDeck Component
+- [ ] Header Component
diff --git a/types/react-native-elements/index.d.ts b/types/react-native-elements/index.d.ts
index 8323ef1c25..5a39c78481 100644
--- a/types/react-native-elements/index.d.ts
+++ b/types/react-native-elements/index.d.ts
@@ -7,6 +7,45 @@
 import * as React from 'react';
 import { ViewStyle, TextStyle } from 'react-native';
 
+export interface TextProps {
+    /**
+     * font size 40
+     */
+    h1?: boolean;
+
+    /**
+     * font size 34
+     */
+    h2?: boolean;
+
+    /**
+     * font size 28
+     */
+    h3?: boolean;
+
+    /**
+     * font size 22
+     */
+    h4?: boolean;
+
+    /**
+     * font family name
+     */
+    fontFamily?: string;
+
+    /**
+     * Additional styling for Text
+     */
+    style?: TextStyle;
+}
+
+/**
+ * HTML Style Headings
+ *
+ * @desc https://react-native-training.github.io/react-native-elements/API/HTML_style_headings/
+ */
+export class Text extends React.Component<TextProps, any> {}
+
 export interface ButtonIcon {
     name?: string;
     color?: string;
diff --git a/types/react-native-elements/react-native-elements-tests.tsx b/types/react-native-elements/react-native-elements-tests.tsx
index 197b1ec202..836b04b431 100644
--- a/types/react-native-elements/react-native-elements-tests.tsx
+++ b/types/react-native-elements/react-native-elements-tests.tsx
@@ -1,6 +1,19 @@
 import * as React from 'react';
 import { View, StyleSheet } from 'react-native';
-import { Button } from 'react-native-elements';
+import { Button, Text } from 'react-native-elements';
+
+class TextTest extends React.Component<any, any> {
+  render() {
+    return (
+      <View>
+        <Text h1>Heading 1</Text>
+        <Text h2>Heading 2</Text>
+        <Text h3>Heading 3</Text>
+        <Text h4>Heading 4</Text>
+      </View>
+    );
+  }
+}
 
 class ButtonTest extends React.Component<any, any> {
   handleButtonPress() {

From 377eb09ae0399563dbb439c75938663cba8e46c6 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Wed, 5 Jul 2017 21:15:46 +0800
Subject: [PATCH 281/287] feat(jsonpath): update to version 0.2.11

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

diff --git a/types/jsonpath/index.d.ts b/types/jsonpath/index.d.ts
index e691f860e1..90f97be2fc 100644
--- a/types/jsonpath/index.d.ts
+++ b/types/jsonpath/index.d.ts
@@ -1,17 +1,17 @@
-// Type definitions for jsonpath 0.1.3
+// Type definitions for jsonpath 0.2.11
 // Project: https://www.npmjs.org/package/jsonpath
-// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
+// Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>, Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
 
 type PathComponent = string | number;
 
-export declare function query(obj: any, pathExpression: string): any[];
-export declare function paths(obj: any, pathExpression: string): PathComponent[][];
-export declare function nodes(obj: any, pathExpression: string): { path: PathComponent[]; value: any; }[];
+export declare function query(obj: any, pathExpression: string, count?: number): any[];
+export declare function paths(obj: any, pathExpression: string, count?: number): PathComponent[][];
+export declare function nodes(obj: any, pathExpression: string, count?: number): { path: PathComponent[]; value: any; }[];
 export declare function value(obj: any, pathExpression: string): any;
-export declare function value(obj: any, pathExpression: string, newValue: any): any;
+export declare function value<T>(obj: any, pathExpression: string, newValue: T): T;
 export declare function parent(obj: any, pathExpression: string): any;
 export declare function apply(obj: any, pathExpression: string, fn: (x: any) => any): { path: PathComponent[]; value: any; }[];
 export declare function parse(pathExpression: string): any[];

From 445f5e856c76a032c4a09b4d2430afce9ff2eb4e Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Wed, 5 Jul 2017 21:30:53 +0800
Subject: [PATCH 282/287] docs(jsonpath): add jsdoc descriptions

---
 types/jsonpath/index.d.ts | 49 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/types/jsonpath/index.d.ts b/types/jsonpath/index.d.ts
index 90f97be2fc..b030605a55 100644
--- a/types/jsonpath/index.d.ts
+++ b/types/jsonpath/index.d.ts
@@ -3,16 +3,61 @@
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>, Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
 type PathComponent = string | number;
 
+/**
+ * Find elements in `obj` matching `pathExpression`. Returns an array of elements that
+ * satisfy the provided JSONPath expression,or an empty array if none were matched.
+ * Returns only first `count` elements if specified.
+ */
 export declare function query(obj: any, pathExpression: string, count?: number): any[];
+
+/**
+ * Find paths to elements in `obj` matching `pathExpression`. Returns an array of
+ * element paths that satisfy the provided JSONPath expression. Each path is itself an
+ * array of keys representing the location within `obj` of the matching element. Returns
+ * only first `count` paths if specified.
+ */
 export declare function paths(obj: any, pathExpression: string, count?: number): PathComponent[][];
+
+/**
+ * Find elements and their corresponding paths in `obj` matching `pathExpression`.
+ * Returns an array of node objects where each node has a `path` containing an array of
+ * keys representing the location within `obj`, and a `value` pointing to the matched
+ * element. Returns only first `count` nodes if specified.
+ */
 export declare function nodes(obj: any, pathExpression: string, count?: number): { path: PathComponent[]; value: any; }[];
+
+/**
+ * Returns the value of the first element matching `pathExpression`. If `newValue` is
+ * provided, sets the value of the first matching element and returns the new value.
+ */
 export declare function value(obj: any, pathExpression: string): any;
 export declare function value<T>(obj: any, pathExpression: string, newValue: T): T;
+
+/**
+ * Returns the parent of the first matching element.
+ */
 export declare function parent(obj: any, pathExpression: string): any;
+
+/**
+ * Runs the supplied function `fn` on each matching element, and replaces each
+ * matching element with the return value from the function. The function accepts the
+ * value of the matching element as its only parameter. Returns matching nodes with
+ * their updated values.
+ */
 export declare function apply(obj: any, pathExpression: string, fn: (x: any) => any): { path: PathComponent[]; value: any; }[];
+
+/**
+ * Parse the provided JSONPath expression into path components and their associated
+ * operations.
+ */
 export declare function parse(pathExpression: string): any[];
+
+/**
+ * Returns a path expression in string form, given a path. The supplied path may either
+ * be a flat array of keys, as returned by `jp.nodes` for example, or may alternatively be a
+ * fully parsed path expression in the form of an array of path components as returned
+ * by `jp.parse`.
+ */
 export declare function stringify(path: PathComponent[]): string;

From f70d20ac03f3900258332ddd76321a14a5d87f34 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Wed, 5 Jul 2017 21:37:16 +0800
Subject: [PATCH 283/287] feat(jsonpath): umd compatible

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

diff --git a/types/jsonpath/index.d.ts b/types/jsonpath/index.d.ts
index b030605a55..36a04ef0de 100644
--- a/types/jsonpath/index.d.ts
+++ b/types/jsonpath/index.d.ts
@@ -61,3 +61,5 @@ export declare function parse(pathExpression: string): any[];
  * by `jp.parse`.
  */
 export declare function stringify(path: PathComponent[]): string;
+
+export as namespace jsonpath;

From 5277a228a0e7fd9e4a9d66edd385a2ad89194822 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Wed, 5 Jul 2017 21:51:36 +0800
Subject: [PATCH 284/287] test(jsonpath): add tests

remove unnecessary comments
---
 types/jsonpath/jsonpath-tests.ts | 44 ++++++++------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/types/jsonpath/jsonpath-tests.ts b/types/jsonpath/jsonpath-tests.ts
index 770258a94f..46b87b3a4c 100644
--- a/types/jsonpath/jsonpath-tests.ts
+++ b/types/jsonpath/jsonpath-tests.ts
@@ -3,52 +3,30 @@ import jp = require('jsonpath');
 
 var data: any;
 
-/**
- * jp.query(obj, pathExpression)
- * Find elements in obj matching pathExpression. Returns an array of elements that satisfy the provided JSONPath expression, or an empty array if none were matched.
- */
+// jp.query()
 var authors = jp.query(data, '$..author');
+var authors = jp.query(data, '$..author', 2);
 
-/**
- * jp.paths(obj, pathExpression)
- * Find elements in obj matching pathExpression. Returns an array of element paths that satisfy the provided JSONPath expression. Each path is itself an array of keys representing the location within obj of the matching element.
- */
+// jp.paths()
 var paths = jp.paths(data, '$..author');
+var paths = jp.paths(data, '$..author', 2);
 
-/**
- * jp.nodes(obj, pathExpression)
- * Find elements and their corresponding paths in obj matching pathExpression. Returns an array of node objects where each node has a path containing an array of keys representing the location within obj, and a value pointing to the matched element.
- */
+// jp.nodes()
 var nodes = jp.nodes(data, '$..author');
+var nodes = jp.nodes(data, '$..author', 2);
 
-/**
- * jp.value(obj, pathExpression, [newValue])
- * Returns the value of the first element matching pathExpression. If newValue is provided, sets the value of the first matching element and returns the new value.
- */
+// jp.value()
 var value = jp.value(data, '$.store..price');
 jp.value(data, '$.store..price', 12.5);
 
-/**
- * jp.parent(obj, pathExpression)
- * Returns the parent of the first matching element.
- */
+// jp.parent()
 var parent = jp.parent(data, '$.store..price');
 
-/**
- * jp.apply(obj, pathExpression, fn)
- * Runs the supplied function fn on each matching element, and replaces each matching element with the return value from the function. The function accepts the value of the matching element as its only parameter. Returns matching nodes with their updated values.
- */
+// jp.apply()
 var nodes = jp.apply(data, '$..author', (value: string) => { return value.toUpperCase() });
 
-/**
- * jp.parse(pathExpression)
- * Parse the provided JSONPath expression into path components and their associated operations.
- */
+// jp.parse()
 var path = jp.parse('$..author');
 
-/**
- * jp.stringify(path)
- * Returns a path expression in string form, given a path. The supplied path may either be a flat array of keys, as returned by jp.nodes for example, or may alternatively be a fully parsed path expression in the form of an array of path components as returned by jp.parse.
- */
+// jp.stringify()
 var pathExpression = jp.stringify(['$', 'store', 'book', 0, 'author']);
-

From ce902f704382a0855a6e7cca9ce2c24883a6e7e8 Mon Sep 17 00:00:00 2001
From: ikatyang <ikatyang@gmail.com>
Date: Thu, 6 Jul 2017 00:29:28 +0800
Subject: [PATCH 285/287] style(jsonpath): remove leading blank line

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

diff --git a/types/jsonpath/jsonpath-tests.ts b/types/jsonpath/jsonpath-tests.ts
index 46b87b3a4c..a6e805c5e8 100644
--- a/types/jsonpath/jsonpath-tests.ts
+++ b/types/jsonpath/jsonpath-tests.ts
@@ -1,4 +1,3 @@
-
 import jp = require('jsonpath');
 
 var data: any;

From 55f6c16919e438da55ef464712682f9e06957065 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Wed, 5 Jul 2017 16:50:18 -0700
Subject: [PATCH 286/287] This should've been in the types folder.

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

diff --git a/is-alphanumerical/index.d.ts b/types/is-alphanumerical/index.d.ts
similarity index 100%
rename from is-alphanumerical/index.d.ts
rename to types/is-alphanumerical/index.d.ts
diff --git a/is-alphanumerical/is-alphanumerical-tests.ts b/types/is-alphanumerical/is-alphanumerical-tests.ts
similarity index 100%
rename from is-alphanumerical/is-alphanumerical-tests.ts
rename to types/is-alphanumerical/is-alphanumerical-tests.ts
diff --git a/is-alphanumerical/tsconfig.json b/types/is-alphanumerical/tsconfig.json
similarity index 100%
rename from is-alphanumerical/tsconfig.json
rename to types/is-alphanumerical/tsconfig.json
diff --git a/is-alphanumerical/tslint.json b/types/is-alphanumerical/tslint.json
similarity index 100%
rename from is-alphanumerical/tslint.json
rename to types/is-alphanumerical/tslint.json

From a83680196054bffe4945402e3de189dbc07cd496 Mon Sep 17 00:00:00 2001
From: Ors Kovacs <orskovacs92@gmail.com>
Date: Thu, 6 Jul 2017 09:50:31 +0200
Subject: [PATCH 287/287] Fixing react-native TextInput style  - adding
 TextStyle Array to ReactNative TextInput style property

---
 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 a7f4324d8b..cdd58762a4 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1205,7 +1205,7 @@ export interface TextInputProperties extends ViewProperties, TextInputIOSPropert
     /**
      * Styles
      */
-    style?: TextStyle
+    style?: TextStyle | Array<TextStyle | undefined>
 
     /**
      * Used to locate this view in end-to-end tests