From bd2218b6f6f1449636dbd32a5458c65be4ccb54b Mon Sep 17 00:00:00 2001
From: James Hegedus <jthegedus@jttech.io>
Date: Mon, 12 Mar 2018 20:30:25 +1100
Subject: [PATCH 001/141] [WIP] Next.js Context Object type

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

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 036e9f58ce..3ebcb9b395 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -6,11 +6,23 @@
 // TypeScript Version: 2.6
 
 /// <reference types="node" />
+/// <reference types="isomorphic-unfetch" />
 
 import * as http from "http";
 import * as url from "url";
+import * as fetch from "isomorphic-unfetch";
 
 declare namespace next {
+    interface NextContext {
+        pathname?: string;                      //path section of URL
+        query?: any;                            // meant to be an object - // query string section of URL parsed as an object
+        asPath?: string;                        // String of the actual path (including the query) shows in the browser
+        req?: http.IncomingMessage;             //HTTP request object (server only)
+        res?: http.ServerResponse;              //HTTP response object (server only)
+        jsonPageRes?: fetch.IsomorphicResponse; //Fetch Response object (client only) - from https://developer.mozilla.org/en-US/docs/Web/API/Response
+        err?: Error;                            //Error object if any error is encountered during the rendering
+    }
+
     type UrlLike = url.UrlObject | url.Url;
 
     interface ServerConfig {

From bcf98ec1f542feb91866a95818824960ec0c796f Mon Sep 17 00:00:00 2001
From: James Hegedus <jthegedus@jttech.io>
Date: Mon, 12 Mar 2018 20:38:23 +1100
Subject: [PATCH 002/141] add self to receive update notifications

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

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 3ebcb9b395..a6cf91ddc6 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/zeit/next.js
 // Definitions by: Drew Hays <https://github.com/dru89>
 //                 Brice BERNARD <https://github.com/brikou>
+//                 James Hegedus <https://github.com/jthegedus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 4b0b64bd58aa00102f3f081a84fcc695378257c8 Mon Sep 17 00:00:00 2001
From: James Hegedus <jthegedus@jttech.io>
Date: Mon, 12 Mar 2018 20:43:21 +1100
Subject: [PATCH 003/141] fix some lint errors and answer qs from PR template

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

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index a6cf91ddc6..77cea7062d 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for next 2.4
+// Type definitions for next 5.0
 // Project: https://github.com/zeit/next.js
 // Definitions by: Drew Hays <https://github.com/dru89>
 //                 Brice BERNARD <https://github.com/brikou>
@@ -7,21 +7,21 @@
 // TypeScript Version: 2.6
 
 /// <reference types="node" />
-/// <reference types="isomorphic-unfetch" />
 
 import * as http from "http";
 import * as url from "url";
 import * as fetch from "isomorphic-unfetch";
 
 declare namespace next {
+    // <<https://github.com/zeit/next.js/issues/1651>>
     interface NextContext {
-        pathname?: string;                      //path section of URL
+        pathname?: string;                      // path section of URL
         query?: any;                            // meant to be an object - // query string section of URL parsed as an object
         asPath?: string;                        // String of the actual path (including the query) shows in the browser
-        req?: http.IncomingMessage;             //HTTP request object (server only)
-        res?: http.ServerResponse;              //HTTP response object (server only)
-        jsonPageRes?: fetch.IsomorphicResponse; //Fetch Response object (client only) - from https://developer.mozilla.org/en-US/docs/Web/API/Response
-        err?: Error;                            //Error object if any error is encountered during the rendering
+        req?: http.IncomingMessage;             // HTTP request object (server only)
+        res?: http.ServerResponse;              // HTTP response object (server only)
+        jsonPageRes?: fetch.IsomorphicResponse; // Fetch Response object (client only) - from https://developer.mozilla.org/en-US/docs/Web/API/Response
+        err?: Error;                            // Error object if any error is encountered during the rendering
     }
 
     type UrlLike = url.UrlObject | url.Url;

From 34026b93c0468e1428770d964bae94e56c1eee8c Mon Sep 17 00:00:00 2001
From: Kiyotoshi Ichikawa <KIchikawa@summitracing.com>
Date: Thu, 5 Apr 2018 13:03:08 -0400
Subject: [PATCH 004/141] [browser-sync] Type definition for Option type is
 missing many valid properties. Also appending tests to cover newly added
 properties/interfaces.

---
 types/browser-sync/browser-sync-tests.ts | 276 +++++++++++++++++++++--
 types/browser-sync/index.d.ts            | 147 +++++++++---
 2 files changed, 379 insertions(+), 44 deletions(-)

diff --git a/types/browser-sync/browser-sync-tests.ts b/types/browser-sync/browser-sync-tests.ts
index bcd829367a..613f8aee25 100644
--- a/types/browser-sync/browser-sync-tests.ts
+++ b/types/browser-sync/browser-sync-tests.ts
@@ -8,11 +8,98 @@ import browserSync = require("browser-sync");
 })();
 
 browserSync({
-    server: {
-        baseDir: "./"
+    ui: true
+});
+
+browserSync({
+    ui: {
+        port: 9000,
+        weinre: {
+            port: 9001
+        }
     }
 });
 
+browserSync({
+    files: "app/css/style.css"
+});
+
+browserSync({
+    files: [
+        "app/css/style.css",
+        "app/js/*.js"
+    ]
+});
+
+browserSync({
+    files: [
+        "app/css/style.css",
+        "!app/js/*.js"
+    ]
+});
+
+browserSync({
+    files: [
+        "wp-content/themes/**/*.css",
+        {
+            match: ["wp-content/themes/**/*.css"],
+            fn: function (event, file) {
+                /** Custom event handler **/
+            }
+        }
+    ]
+});
+
+browserSync({
+    watchEvents: [
+        "change",
+        "add",
+        "unlink",
+        "addDir",
+        "unlinkDir"
+    ]
+});
+
+browserSync({
+    watch: true
+});
+
+browserSync({
+    ignore: [
+        "app/js/*.js"
+    ]
+});
+
+browserSync({
+    single: true
+});
+
+browserSync({
+    watchOptions: {
+        ignoreInitial: true,
+        ignored: '*.txt'
+    },
+    files: ['./app']
+});
+
+browserSync({
+    files: [
+        {
+            match: ["wp-content/themes/**/*.php"],
+            fn: function (event, file) {
+                /** Custom event handler **/
+            },
+            options: {
+                ignored: '*.txt'
+            }
+        }
+    ]
+});
+
+browserSync({
+    server: "app"
+});
+
 // multiple base directory
 browserSync({
     server: {
@@ -20,6 +107,39 @@ browserSync({
     }
 });
 
+browserSync({
+    server: true
+});
+
+browserSync({
+    server: {
+        baseDir: "./"
+    }
+});
+
+browserSync({
+    server: {
+        baseDir: "./",
+        index: "index.htm"
+    }
+});
+
+browserSync({
+    server: {
+        baseDir: "./",
+        directory: true
+    }
+});
+
+browserSync({
+    server: {
+        baseDir: "app",
+        serveStaticOptions: {
+            extensions: ["html"]
+        }
+    }
+});
+
 browserSync({
     proxy: "yourlocal.dev"
 });
@@ -27,8 +147,8 @@ browserSync({
 browserSync({
     proxy: {
         target: "http://yourlocal.dev",
-        proxyReq: function(proxyReq) {
-           console.log(proxyReq);
+        proxyReq: function (proxyReq) {
+            console.log(proxyReq);
         }
     }
 });
@@ -37,7 +157,7 @@ browserSync({
     proxy: {
         target: "http://yourlocal.dev",
         proxyReq: [
-            function(proxyReq) {
+            function (proxyReq) {
                 console.log(proxyReq);
             }
         ]
@@ -47,7 +167,7 @@ browserSync({
 browserSync({
     proxy: {
         target: "http://yourlocal.dev",
-        proxyRes: function(proxyRes, req, res) {
+        proxyRes: function (proxyRes, req, res) {
             console.log(proxyRes);
         }
     }
@@ -57,13 +177,137 @@ browserSync({
     proxy: {
         target: "http://yourlocal.dev",
         proxyRes: [
-            function(proxyRes, req, res) {
+            function (proxyRes, req, res) {
                 console.log(proxyRes);
             }
         ]
     }
 });
 
+browserSync({
+    proxy: "https://yourlocal.dev",
+    https: {
+        key: "./path/to/the/key/file.key",
+        cert: "./path/to/the/cert/file.cer"
+    }
+});
+
+browserSync({
+    port: 3000
+});
+
+browserSync({
+    proxy: "http://yourlocal.dev",
+    serveStatic: ['.', './app/css']
+});
+
+browserSync({
+    proxy: "http://yourlocal.dev",
+    serveStatic: [{
+        route: '/assets',
+        dir: 'tmp'
+    }]
+});
+
+browserSync({
+    proxy: "http://yourlocal.dev",
+    serveStatic: [{
+        route: ['/assets', '/content'],
+        dir: 'tmp'
+    }]
+});
+
+browserSync({
+    proxy: "http://yourlocal.dev",
+    serveStatic: [{
+        route: '/assets',
+        dir: ['./tmp', './app']
+    }]
+});
+
+browserSync({
+    serveStatic: ['.', './app', './temp'],
+    serveStaticOptions: {
+        extensions: ['html'] // pretty urls
+    }
+});
+
+browserSync({
+    https: true
+});
+
+browserSync({
+    server: "./app",
+    https: true
+});
+
+browserSync({
+    server: "./app",
+    https: {
+        key: "./path/to/the/key/file.key",
+        cert: "./path/to/the/cert/file.cer"
+    }
+});
+
+browserSync({
+    httpModule: "http2"
+});
+
+browserSync({
+    ghostMode: {
+        clicks: true,
+        scroll: true,
+        forms: {
+            inputs: true,
+            submit: true,
+            toggles: true
+        }
+    },
+    proxy: "https://yourlocal.dev"
+});
+
+/**
+ * Not testing a bunch because they are either only string or boolean types.
+ * ....Also just got lazy and tired of writing the simple ones.
+ */
+
+browserSync({
+    snippetOptions: {
+
+        // Ignore all HTML files within the templates folder
+        blacklist: [
+            "templates/*.html"
+        ],
+        // Provide a custom Regex for inserting the snippet.
+        rule: {
+            match: /<\/body>/i,
+            fn: function (snippet, match) {
+                return snippet + match;
+            }
+        }
+    }
+});
+
+browserSync({
+    rewriteRules: [
+        {
+            match: /Browsersync/g,
+            fn: function (req, res, match) {
+                return 'kittenz';
+            }
+        }
+    ]
+});
+
+browserSync({
+    rewriteRules: [
+        {
+            match: /(cats|kitten[sz]) are mediocre/g,
+            replace: "$1 are excellent"
+        }
+    ]
+});
+
 var config = {
     server: {
         baseDir: "./"
@@ -84,13 +328,13 @@ browserSync(config, function (err, bs) {
 browserSync.reload();
 
 // single file
-browserSync.reload( "styles.css" );
+browserSync.reload("styles.css");
 
 // multiple files
-browserSync.reload( ["styles.css", "ie.css"] );
+browserSync.reload(["styles.css", "ie.css"]);
 
 // streams support
-browserSync.reload( { stream: true } );
+browserSync.reload({ stream: true });
 
 browserSync.notify("Compiling, please wait!");
 
@@ -143,19 +387,19 @@ browser.exit();
 browser.stream();
 
 // -- "once" option.
-browser.stream({once: true});
+browser.stream({ once: true });
 
 // -- "match" option (string).
-browser.stream({match: "**/*.js"});
+browser.stream({ match: "**/*.js" });
 
 // -- "match" option (RegExp).
-browser.stream({match: /\.js$/});
+browser.stream({ match: /\.js$/ });
 
 // -- "match" option (function).
-browser.stream({match: (testString) => true});
+browser.stream({ match: (testString) => true });
 
 // -- "match" option (array).
-browser.stream({match: ["**/*.js", /\.js$/, (testString) => true]});
+browser.stream({ match: ["**/*.js", /\.js$/, (testString) => true] });
 
 // -- Both options.
-browser.stream({once: true, match: ["**/*.js", /\.js$/, (testString) => true]});
+browser.stream({ once: true, match: ["**/*.js", /\.js$/, (testString) => true] });
diff --git a/types/browser-sync/index.d.ts b/types/browser-sync/index.d.ts
index b22054c367..3b97fc8616 100644
--- a/types/browser-sync/index.d.ts
+++ b/types/browser-sync/index.d.ts
@@ -1,16 +1,21 @@
 // Type definitions for browser-sync
 // Project: http://www.browsersync.io/
-// Definitions by: Asana <https://asana.com>, Joe Skeen <https://github.com/joeskeen>
+// Definitions by: Asana <https://asana.com>,
+//                 Joe Skeen <https://github.com/joeskeen>
 //                 Thomas "Thasmo" Deinhamer <https://thasmo.com/>
+//                 Kiyotoshi Ichikawa <https://github.com/aznnomness>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="chokidar"/>
 /// <reference types="node" />
+/// <reference types="serve-static" />
 
 import * as chokidar from "chokidar";
 import * as fs from "fs";
 import * as http from "http";
 import * as mm from "micromatch";
+import { ServeStaticOptions } from "serve-static";
 
 declare namespace browserSync {
     interface Options {
@@ -20,7 +25,7 @@ declare namespace browserSync {
          *
          * port - Default: 3001
          * weinre.port - Default: 8080
-         * Note: requires at least version 2.0.0
+         * Note: Requires at least version 2.0.0.
          */
         ui?: UIOptions | boolean;
         /**
@@ -29,20 +34,40 @@ declare namespace browserSync {
          * patterns.
          * Default: false
          */
-        files?: string | (string | FileCallback)[];
+        files?: string | (string | FileCallback | object)[];
+        /**
+         * Specify which file events to respond to.
+         * Available events: `add`, `change`, `unlink`, `addDir`, `unlinkDir`
+         */
+        watchEvents?: string[];
+        /**
+         * Watch files automatically.
+         */
+        watch?: boolean;
+        /**
+         * Patterns for any watchers to ignore.
+         * Anything provided here will end up inside 'watchOptions.ignored'.
+         */
+        ignore?: string[];
+        /**
+         * Serve an index.html file for all non-asset routes.
+         * Useful when using client-routers.
+         */
+        single?: boolean;
         /**
          * File watching options that get passed along to Chokidar. Check their docs for available options
          * Default: undefined
-         * Note: requires at least version 2.6.0
+         * Note: Requires at least version 2.6.0.
          */
         watchOptions?: chokidar.WatchOptions;
         /**
          * Use the built-in static server for basic HTML/JS/CSS websites.
          * Default: false
          */
-        server?: ServerOptions;
+        server?: string | boolean | string[] | ServerOptions;
         /**
          * Proxy an EXISTING vhost. Browsersync will wrap your vhost with a proxy URL to view your site.
+         * Passing only a URL as a string equates to passing only target property of ProxyOptions type.
          * target - Default: undefined
          * ws - Default: undefined
          * middleware - Default: undefined
@@ -50,25 +75,40 @@ declare namespace browserSync {
          * proxyRes - Default: undefined
          * proxyReq - Default: undefined
          */
-        proxy?: string | boolean | ProxyOptions;
+        proxy?: string | ProxyOptions;
         /**
          * Use a specific port (instead of the one auto-detected by Browsersync)
          * Default: 3000
          */
         port?: number;
+        /**
+         * Functions or actual plugins used as middleware.
+         */
+        middleware?: MiddlewareHandler | PerRouteMiddleware | (MiddlewareHandler | PerRouteMiddleware)[];
         /**
          * Add additional directories from which static files should be served.
          * Should only be used in proxy or snippet mode.
          * Default: []
-         * Note: requires at least version 2.8.0
+         * Note: Requires at least version 2.8.0.
          */
-        serveStatic?: string[];
+        serveStatic?: (string | { route?: string | string[], dir?: string | string[]})[];
+        /**
+         * Options that are passed to the serve-static middleware when you use the
+         * string[] syntax: eg: `serveStatic: ['./app']`.
+         * Please see [serve-static](https://github.com/expressjs/serve-static) for details.
+         */
+        serveStaticOptions?: ServeStaticOptions;
         /**
          * Enable https for localhost development.
-         * Note - this is not needed for proxy option as it will be inferred from your target url.
-         * Note: requires at least version 1.3.0
+         * Note: This may not be needed for proxy option as it will try to infer from your target url.
+         * Note: If privacy error is encountered please see HttpsOptions below, setting those will resolve.
+         * Note: Requires at least version 1.3.0.
          */
-        https?: boolean;
+        https?: boolean | HttpsOptions;
+        /**
+         * Override http module to allow using 3rd party server modules (such as http2).
+         */
+        httpModule?: string;
         /**
          * Clicks, Scrolls & Form inputs on any device will be mirrored to all others.
          * clicks - Default: true
@@ -84,7 +124,7 @@ declare namespace browserSync {
         /**
          * Change the console logging prefix. Useful if you're creating your own project based on Browsersync
          * Default: BS
-         * Note: requires at least version 1.5.1
+         * Note: Requires at least version 1.5.1.
          */
         logPrefix?: string;
         /**
@@ -100,19 +140,19 @@ declare namespace browserSync {
         /**
          * Log the snippet to the console when you're in snippet mode (no proxy/server)
          * Default: true
-         * Note: requires at least version 1.5.2
+         * Note: Requires at least version 1.5.2.
          */
         logSnippet?: boolean;
         /**
          * You can control how the snippet is injected onto each page via a custom regex + function.
          * You can also provide patterns for certain urls that should be ignored from the snippet injection.
-         * Note: requires at least version 2.0.0
+         * Note: Requires at least version 2.0.0.
          */
         snippetOptions?: SnippetOptions;
         /**
          * Add additional HTML rewriting rules.
          * Default: false
-         * Note: requires at least version 2.4.0
+         * Note: Requires at least version 2.4.0.
          */
         rewriteRules?: boolean | RewriteRules[];
         /**
@@ -139,7 +179,7 @@ declare namespace browserSync {
         /**
          * Add HTTP access control (CORS) headers to assets served by Browsersync.
          * Default: false
-         * Note: requires at least version 2.16.0
+         * Note: Requires at least version 2.16.0.
          */
         cors?: boolean;
         /**
@@ -177,12 +217,12 @@ declare namespace browserSync {
         /**
          * Sync the scroll position of any element on the page. Add any amount of CSS selectors
          * Default: []
-         * Note: requires at least version 2.9.0
+         * Note: Requires at least version 2.9.0.
          */
         scrollElements?: string[];
         /**
          * Default: []
-         * Note: requires at least version 2.9.0
+         * Note: Requires at least version 2.9.0.
          * Sync the scroll position of any element on the page - where any scrolled element will cause
          * all others to match scroll position. This is helpful when a breakpoint alters which element
          * is actually scrolling
@@ -197,13 +237,18 @@ declare namespace browserSync {
         /**
          * Restrict the frequency in which browser:reload events can be emitted to connected clients
          * Default: 0
-         * Note: requires at least version 2.6.0
+         * Note: Requires at least version 2.6.0.
          */
         reloadDebounce?: number;
+        /**
+         * Emit only the first event during sequential time windows of a specified duration.
+         * Note: Requires at least version 2.13.0.
+         */
+        reloadThrottle?: number;
         /**
          * User provided plugins
          * Default: []
-         * Note: requires at least version 2.6.0
+         * Note: Requires at least version 2.6.0.
          */
         plugins?: any[];
         /**
@@ -224,6 +269,10 @@ declare namespace browserSync {
          * Override host detection if you know the correct IP to use
          */
         host?: string;
+        /**
+         * Support environments where dynamic hostnames are not required (ie: electron).
+         */
+        localOnly?: boolean;
         /**
          * Send file-change events to the browser
          * Default: true
@@ -234,10 +283,16 @@ declare namespace browserSync {
          * Default: true
          */
         timestamps?: boolean;
+        /**
+         * ¯\_(ツ)_/¯
+         * Best guess, when ghostMode (or SocketIO?) is setup the events
+         * listed here will be emitted and able to hook into.
+         */
+        clientEvents?: string[];
         /**
          * Alter the script path for complete control over where the Browsersync Javascript is served
          * from. Whatever you return from this function will be used as the script path.
-         * Note: requires at least version 1.5.0
+         * Note: Requires at least version 1.5.0.
          */
         scriptPath?: (path: string) => string;
         /**
@@ -248,10 +303,21 @@ declare namespace browserSync {
          * domain - Default: undefined
          * port - Default: undefined
          * clients.heartbeatTimeout - Default: 5000
-         * Note: requires at least version 1.6.2
+         * Note: Requires at least version 1.6.2.
          */
         socket?: SocketOptions;
-        middleware?: MiddlewareHandler | PerRouteMiddleware | (MiddlewareHandler | PerRouteMiddleware)[];
+        /**
+         * ¯\_(ツ)_/¯
+         */
+        tagNames?: TagNamesOptions;
+        /**
+         * ¯\_(ツ)_/¯
+         */
+        injectFileTypes?: string[];
+        /**
+         * ¯\_(ツ)_/¯
+         */
+        excludeFileTypes?: string[];
     }
 
     interface Hash<T> {
@@ -287,6 +353,7 @@ declare namespace browserSync {
         routes?: Hash<string>;
         /** configure custom middleware */
         middleware?: (MiddlewareHandler | PerRouteMiddleware)[];
+        serveStaticOptions?: ServeStaticOptions
     }
 
     interface ProxyOptions {
@@ -298,6 +365,11 @@ declare namespace browserSync {
         proxyReq?: ((res: http.ServerRequest) => any)[] | ((res: http.ServerRequest) => any);
     }
 
+    interface HttpsOptions {
+        key?: string;
+        cert?: string;
+    }
+
     interface MiddlewareHandler {
         (req: http.IncomingMessage, res: http.ServerResponse, next: Function): any;
     }
@@ -310,11 +382,17 @@ declare namespace browserSync {
     interface GhostOptions {
         clicks?: boolean;
         scroll?: boolean;
-        forms?: boolean;
+        forms?: boolean | {
+            submit?: boolean;
+            inputs?: boolean;
+            toggles?: boolean;
+        };
     }
 
     interface SnippetOptions {
-        ignorePaths?: string;
+        async?: boolean,
+        whitelist?: string[],
+        blacklist?: string[],
         rule?: { match?: RegExp; fn?: (snippet: string, match: string) => any };
     }
 
@@ -327,9 +405,22 @@ declare namespace browserSync {
         clients?: { heartbeatTimeout?: number; };
     }
 
+    interface TagNamesOptions {
+        less?: string;
+        scss?: string;
+        css?: string;
+        jpg?: string;
+        jpeg?: string;
+        png?: string;
+        svg?: string;
+        gif?: string;
+        js?: string;
+    }
+
     interface RewriteRules {
         match: RegExp;
-        fn: (match: string) => string;
+        replace?: string;
+        fn?: (req: http.IncomingMessage, res: http.ServerResponse, match: string) => string;
     }
 
     interface StreamOptions {
@@ -342,7 +433,7 @@ declare namespace browserSync {
          * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
          * depending on your use-case.
          */
-        (config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
+        (config?: Options, callback?: (err: Error, bs: object) => any): BrowserSyncInstance;
         /**
          * Create a Browsersync instance
          * @param name an identifier that can used for retrieval later
@@ -367,7 +458,7 @@ declare namespace browserSync {
          * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
          * depending on your use-case.
          */
-        init(config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
+        init(config?: Options, callback?: (err: Error, bs: object) => any): BrowserSyncInstance;
         /**
          * Reload the browser
          * The reload method will inform all browsers about changed files and will either cause the browser

From 55194a76e4854bca216f818098be7ebd5f5b8f67 Mon Sep 17 00:00:00 2001
From: Kiyotoshi Ichikawa <kji.websolutions@gmail.com>
Date: Wed, 25 Apr 2018 15:43:30 -0400
Subject: [PATCH 005/141] Updated types and appended some. The proxy.proxyRes
 property could be further expressed to take one or three parameters. Its
 previous representation was not correct according to the documentation and
 default configuration the package generates. Specified types for watchEvents,
 open, and logLevel options. Converted type Object references to object per
 recommended guidelines of DefinitelyTyped repo. Converted type Function
 references to arrow function. More SnippetOptions properties, defined
 FormsOptions under GhostOptions. Added and modified tests.

---
 types/browser-sync/browser-sync-tests.ts | 28 ++++++++++--
 types/browser-sync/index.d.ts            | 56 +++++++++++++++++-------
 2 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/types/browser-sync/browser-sync-tests.ts b/types/browser-sync/browser-sync-tests.ts
index 613f8aee25..c63cb0c862 100644
--- a/types/browser-sync/browser-sync-tests.ts
+++ b/types/browser-sync/browser-sync-tests.ts
@@ -167,8 +167,8 @@ browserSync({
 browserSync({
     proxy: {
         target: "http://yourlocal.dev",
-        proxyRes: function (proxyRes, req, res) {
-            console.log(proxyRes);
+        proxyRes: function (proxyResponse, req, res) {
+            console.log(proxyResponse);
         }
     }
 });
@@ -177,8 +177,28 @@ browserSync({
     proxy: {
         target: "http://yourlocal.dev",
         proxyRes: [
-            function (proxyRes, req, res) {
-                console.log(proxyRes);
+            function (proxyResponse, req, res) {
+                console.log(proxyResponse);
+            }
+        ]
+    }
+});
+
+browserSync({
+    proxy: {
+        target: "http://yourlocal.dev",
+        proxyRes: function (res) {
+            console.log(res);
+        }
+    }
+});
+
+browserSync({
+    proxy: {
+        target: "http://yourlocal.dev",
+        proxyRes: [
+            function (res) {
+                console.log(res);
             }
         ]
     }
diff --git a/types/browser-sync/index.d.ts b/types/browser-sync/index.d.ts
index 3b97fc8616..de0a457266 100644
--- a/types/browser-sync/index.d.ts
+++ b/types/browser-sync/index.d.ts
@@ -39,7 +39,7 @@ declare namespace browserSync {
          * Specify which file events to respond to.
          * Available events: `add`, `change`, `unlink`, `addDir`, `unlinkDir`
          */
-        watchEvents?: string[];
+        watchEvents?: WatchEvents | string[];
         /**
          * Watch files automatically.
          */
@@ -72,7 +72,7 @@ declare namespace browserSync {
          * ws - Default: undefined
          * middleware - Default: undefined
          * reqHeaders - Default: undefined
-         * proxyRes - Default: undefined
+         * proxyRes - Default: undefined (http.ServerResponse if expecting single parameter)
          * proxyReq - Default: undefined
          */
         proxy?: string | ProxyOptions;
@@ -91,7 +91,7 @@ declare namespace browserSync {
          * Default: []
          * Note: Requires at least version 2.8.0.
          */
-        serveStatic?: (string | { route?: string | string[], dir?: string | string[]})[];
+        serveStatic?: StaticOptions[] | string[];
         /**
          * Options that are passed to the serve-static middleware when you use the
          * string[] syntax: eg: `serveStatic: ['./app']`.
@@ -120,7 +120,7 @@ declare namespace browserSync {
          * Can be either "info", "debug", "warn", or "silent"
          * Default: info
          */
-        logLevel?: string;
+        logLevel?: LogLevel;
         /**
          * Change the console logging prefix. Useful if you're creating your own project based on Browsersync
          * Default: BS
@@ -170,7 +170,7 @@ declare namespace browserSync {
          * Decide which URL to open automatically when Browsersync starts. Defaults to "local" if none set.
          * Can be true, local, external, ui, ui-external, tunnel or false
          */
-        open?: string | boolean;
+        open?: OpenOptions | boolean;
         /**
          * The browser(s) to open
          * Default: default
@@ -320,6 +320,12 @@ declare namespace browserSync {
         excludeFileTypes?: string[];
     }
 
+    type WatchEvents = "add" | "change" | "unlink" | "addDir" | "unlinkDir";
+
+    type LogLevel = "info" | "debug" | "warn" | "silent";
+
+    type OpenOptions = "local" | "external" | "ui" | "ui-external" | "tunnel";
+
     interface Hash<T> {
         [path: string]: T;
     }
@@ -353,16 +359,21 @@ declare namespace browserSync {
         routes?: Hash<string>;
         /** configure custom middleware */
         middleware?: (MiddlewareHandler | PerRouteMiddleware)[];
-        serveStaticOptions?: ServeStaticOptions
+        serveStaticOptions?: ServeStaticOptions;
     }
 
     interface ProxyOptions {
         target?: string;
         middleware?: MiddlewareHandler;
         ws?: boolean;
-        reqHeaders?: (config: any) => Hash<any>;
-        proxyRes?: ((res: http.ServerResponse, req: http.IncomingMessage, next: Function) => any)[] | ((res: http.ServerResponse, req: http.IncomingMessage, next: Function) => any);
-        proxyReq?: ((res: http.ServerRequest) => any)[] | ((res: http.ServerRequest) => any);
+        reqHeaders?: (config: object) => Hash<object>;
+        proxyRes?: ProxyResponseMiddleware | ProxyResponseMiddleware[];
+        proxyReq?: ((res: http.ServerRequest) => void)[] | ((res: http.ServerRequest) => void);
+        error?: (err: NodeJS.ErrnoException, req: http.IncomingMessage, res: http.ServerResponse) => void;
+    }
+
+    interface ProxyResponseMiddleware {
+        (proxyRes: http.ServerResponse | http.IncomingMessage, res: http.ServerResponse, req: http.IncomingMessage): void;
     }
 
     interface HttpsOptions {
@@ -370,11 +381,17 @@ declare namespace browserSync {
         cert?: string;
     }
 
+    interface StaticOptions {
+        route: string | string[],
+        dir: string | string[]
+    }
+
     interface MiddlewareHandler {
-        (req: http.IncomingMessage, res: http.ServerResponse, next: Function): any;
+        (req: http.IncomingMessage, res: http.ServerResponse, next: () => void): any;
     }
 
     interface PerRouteMiddleware {
+        id?: string;
         route: string;
         handle: MiddlewareHandler;
     }
@@ -382,18 +399,23 @@ declare namespace browserSync {
     interface GhostOptions {
         clicks?: boolean;
         scroll?: boolean;
-        forms?: boolean | {
-            submit?: boolean;
-            inputs?: boolean;
-            toggles?: boolean;
-        };
+        forms?: FormsOptions | boolean;
+    }
+
+    interface FormsOptions {
+        inputs: boolean,
+        submit: boolean,
+        toggles: boolean
     }
 
     interface SnippetOptions {
-        async?: boolean,
+        async?: boolean;
         whitelist?: string[],
         blacklist?: string[],
-        rule?: { match?: RegExp; fn?: (snippet: string, match: string) => any };
+        rule?: {
+            match?: RegExp;
+            fn?: (snippet: string, match: string) => any
+        };
     }
 
     interface SocketOptions {

From 16fe1426ca2d73ae73299e0e6a9f76c3075a65ad Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Wed, 2 May 2018 00:29:28 +0700
Subject: [PATCH 006/141] [next] NextContext type adjustments

* Add renderPage property to `NextContext`
* `pathname`, `query`, and `asPath` is always defined
* fixed object types, add proper JSDoc to context interface
---
 types/next/index.d.ts | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 77cea7062d..5ecfba20da 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -15,13 +15,28 @@ import * as fetch from "isomorphic-unfetch";
 declare namespace next {
     // <<https://github.com/zeit/next.js/issues/1651>>
     interface NextContext {
-        pathname?: string;                      // path section of URL
-        query?: any;                            // meant to be an object - // query string section of URL parsed as an object
-        asPath?: string;                        // String of the actual path (including the query) shows in the browser
-        req?: http.IncomingMessage;             // HTTP request object (server only)
-        res?: http.ServerResponse;              // HTTP response object (server only)
-        jsonPageRes?: fetch.IsomorphicResponse; // Fetch Response object (client only) - from https://developer.mozilla.org/en-US/docs/Web/API/Response
-        err?: Error;                            // Error object if any error is encountered during the rendering
+        /** path section of URL */
+        pathname: string
+        /** query string section of URL parsed as an object */
+        query: {
+            [key: string]: any
+        }
+        /** String of the actual path (including the query) shows in the browser */
+        asPath: string
+        /** HTTP request object (server only) */
+        req?: http.IncomingMessage
+        /** HTTP response object (server only) */
+        res?: http.ServerResponse
+        /** Fetch Response object (client only) - from https://developer.mozilla.org/en-US/docs/Web/API/Response */
+        jsonPageRes?: fetch.IsomorphicResponse
+        /** Error object if any error is encountered during the rendering */
+        err?: Error
+        /** a callback that executes the actual React rendering logic (synchronously) */
+        renderPage(
+            cb: (enhancer: () => JSX.Element) => React.ComponentType<any>
+        ): {
+            [key: string]: any
+        }
     }
 
     type UrlLike = url.UrlObject | url.Url;

From 6145af0a3acff432e4d24a5e90ec6125bce7f5b6 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Wed, 2 May 2018 00:34:12 +0700
Subject: [PATCH 007/141] [next] renderPage callback should be optional

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

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 5ecfba20da..7f7c58140e 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -33,7 +33,7 @@ declare namespace next {
         err?: Error
         /** a callback that executes the actual React rendering logic (synchronously) */
         renderPage(
-            cb: (enhancer: () => JSX.Element) => React.ComponentType<any>
+            cb?: (enhancer: () => JSX.Element) => React.ComponentType<any>
         ): {
             [key: string]: any
         }

From 07de2cfd39a8da31d5013d77180ed45a72637ff1 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Sat, 5 May 2018 00:34:47 +0700
Subject: [PATCH 008/141] [next] target next@6.0.0

`next@6.0.0` is out, so let's change the target version to it
---
 types/next/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 7f7c58140e..3abb22a2a4 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for next 5.0
+// Type definitions for next 6.0
 // Project: https://github.com/zeit/next.js
 // Definitions by: Drew Hays <https://github.com/dru89>
 //                 Brice BERNARD <https://github.com/brikou>

From a47662329cfbdd2978f58a4591248069341c48df Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Fri, 11 May 2018 22:38:21 +0700
Subject: [PATCH 009/141] Add NextStatelessComponent interface

---
 types/next/index.d.ts                    |  6 ++++++
 types/next/test/next-component-tests.tsx | 26 ++++++++++++++++++++++++
 types/next/tsconfig.json                 |  3 ++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 types/next/test/next-component-tests.tsx

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 3abb22a2a4..52c34542ba 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Drew Hays <https://github.com/dru89>
 //                 Brice BERNARD <https://github.com/brikou>
 //                 James Hegedus <https://github.com/jthegedus>
+//                 Resi Respati <https://github.com/resir014>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -39,6 +40,11 @@ declare namespace next {
         }
     }
 
+    type NextSFC<P = {}> = NextStatelessComponent<P>;
+    interface NextStatelessComponent<P = {}> extends React.StatelessComponent<P> {
+        getInitialProps?: (ctx: NextContext) => Promise<any>;
+    }
+
     type UrlLike = url.UrlObject | url.Url;
 
     interface ServerConfig {
diff --git a/types/next/test/next-component-tests.tsx b/types/next/test/next-component-tests.tsx
new file mode 100644
index 0000000000..33ecb6bc93
--- /dev/null
+++ b/types/next/test/next-component-tests.tsx
@@ -0,0 +1,26 @@
+import * as React from "react";
+import { NextStatelessComponent } from "next";
+
+interface NextComponentProps {
+    example: string
+}
+
+class ClassNext extends React.Component<NextComponentProps> {
+    async getInitialProps() {
+        return { example: 'example' }
+    }
+
+    render() {
+        return (
+            <div>I'm a stateless component! {this.props.example}</div>
+        )
+    }
+}
+
+const StatelessNext: NextStatelessComponent<NextComponentProps> = ({ example }) => (
+    <div>I'm a stateless component! {example}</div>
+)
+
+StatelessNext.getInitialProps = async () => {
+    return { example: 'example' }
+}
diff --git a/types/next/tsconfig.json b/types/next/tsconfig.json
index 48d3f0c8be..d22768e4a1 100644
--- a/types/next/tsconfig.json
+++ b/types/next/tsconfig.json
@@ -33,6 +33,7 @@
         "test/next-document-tests.tsx",
         "test/next-link-tests.tsx",
         "test/next-dynamic-tests.tsx",
-        "test/next-router-tests.tsx"
+        "test/next-router-tests.tsx",
+        "test/next-component-tests.tsx"
     ]
 }

From ba8d541851f904fba222022c449683fe5c3d6cff Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Fri, 11 May 2018 22:42:03 +0700
Subject: [PATCH 010/141] [next] Use NodeResponse because of
 unfetch.IsomorphicResponse

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

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 52c34542ba..d83b787b4a 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -11,7 +11,8 @@
 
 import * as http from "http";
 import * as url from "url";
-import * as fetch from "isomorphic-unfetch";
+
+import { Response as NodeResponse } from "node-fetch";
 
 declare namespace next {
     // <<https://github.com/zeit/next.js/issues/1651>>
@@ -29,7 +30,7 @@ declare namespace next {
         /** HTTP response object (server only) */
         res?: http.ServerResponse
         /** Fetch Response object (client only) - from https://developer.mozilla.org/en-US/docs/Web/API/Response */
-        jsonPageRes?: fetch.IsomorphicResponse
+        jsonPageRes?: NodeResponse
         /** Error object if any error is encountered during the rendering */
         err?: Error
         /** a callback that executes the actual React rendering logic (synchronously) */

From 4dff7d985840fbe92101a8d5d3d8b5ccca9eb5f8 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Fri, 11 May 2018 22:51:14 +0700
Subject: [PATCH 011/141] [next] Added typings for `next/app`

---
 types/next/app.d.ts                | 10 ++++++++++
 types/next/test/next-app-tests.tsx | 27 +++++++++++++++++++++++++++
 types/next/tsconfig.json           |  1 +
 3 files changed, 38 insertions(+)
 create mode 100644 types/next/app.d.ts
 create mode 100644 types/next/test/next-app-tests.tsx

diff --git a/types/next/app.d.ts b/types/next/app.d.ts
new file mode 100644
index 0000000000..6d10d77af8
--- /dev/null
+++ b/types/next/app.d.ts
@@ -0,0 +1,10 @@
+import * as React from "react";
+
+export interface AppComponentProps {
+    Component: React.ComponentType<any>;
+    pageProps: any
+}
+
+export class Container extends React.Component {}
+
+export default class App<P = {}> extends React.Component<P & AppComponentProps> {}
diff --git a/types/next/test/next-app-tests.tsx b/types/next/test/next-app-tests.tsx
new file mode 100644
index 0000000000..3e7c56f87c
--- /dev/null
+++ b/types/next/test/next-app-tests.tsx
@@ -0,0 +1,27 @@
+import * as React from "react";
+import App, { Container } from "next/app";
+
+interface NextComponentProps {
+    example: string;
+}
+
+class TestApp extends App<NextComponentProps> {
+    static async getInitialProps({ Component, router, ctx }: any) {
+        let pageProps = {};
+
+        if (Component.getInitialProps) {
+            pageProps = await Component.getInitialProps(ctx);
+        }
+
+        return { pageProps };
+    }
+
+    render() {
+        const { Component, pageProps } = this.props;
+        return (
+            <Container>
+                <Component {...pageProps} />
+            </Container>
+        );
+    }
+}
diff --git a/types/next/tsconfig.json b/types/next/tsconfig.json
index d22768e4a1..36aef39491 100644
--- a/types/next/tsconfig.json
+++ b/types/next/tsconfig.json
@@ -28,6 +28,7 @@
         "router.d.ts",
         "config.d.ts",
         "test/next-tests.ts",
+        "test/next-app-tests.tsx",
         "test/next-error-tests.tsx",
         "test/next-head-tests.tsx",
         "test/next-document-tests.tsx",

From 3c4579913defe15ac6bd51858f88dc17e7477d3f Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Fri, 11 May 2018 23:03:41 +0700
Subject: [PATCH 012/141] [next] run dtslint

---
 types/next/index.d.ts                    | 21 ++++++++++++---------
 types/next/test/next-component-tests.tsx | 12 ++++++------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index d83b787b4a..939dc27bdb 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -15,30 +15,33 @@ import * as url from "url";
 import { Response as NodeResponse } from "node-fetch";
 
 declare namespace next {
-    // <<https://github.com/zeit/next.js/issues/1651>>
+    /**
+     * Context object used in methods like `getInitialProps()`
+     * <<https://github.com/zeit/next.js/issues/1651>>
+     */
     interface NextContext {
         /** path section of URL */
-        pathname: string
+        pathname: string;
         /** query string section of URL parsed as an object */
         query: {
             [key: string]: any
-        }
+        };
         /** String of the actual path (including the query) shows in the browser */
-        asPath: string
+        asPath: string;
         /** HTTP request object (server only) */
-        req?: http.IncomingMessage
+        req?: http.IncomingMessage;
         /** HTTP response object (server only) */
-        res?: http.ServerResponse
+        res?: http.ServerResponse;
         /** Fetch Response object (client only) - from https://developer.mozilla.org/en-US/docs/Web/API/Response */
-        jsonPageRes?: NodeResponse
+        jsonPageRes?: NodeResponse;
         /** Error object if any error is encountered during the rendering */
-        err?: Error
+        err?: Error;
         /** a callback that executes the actual React rendering logic (synchronously) */
         renderPage(
             cb?: (enhancer: () => JSX.Element) => React.ComponentType<any>
         ): {
             [key: string]: any
-        }
+        };
     }
 
     type NextSFC<P = {}> = NextStatelessComponent<P>;
diff --git a/types/next/test/next-component-tests.tsx b/types/next/test/next-component-tests.tsx
index 33ecb6bc93..a6e870f8e2 100644
--- a/types/next/test/next-component-tests.tsx
+++ b/types/next/test/next-component-tests.tsx
@@ -2,25 +2,25 @@ import * as React from "react";
 import { NextStatelessComponent } from "next";
 
 interface NextComponentProps {
-    example: string
+    example: string;
 }
 
 class ClassNext extends React.Component<NextComponentProps> {
     async getInitialProps() {
-        return { example: 'example' }
+        return { example: 'example' };
     }
 
     render() {
         return (
             <div>I'm a stateless component! {this.props.example}</div>
-        )
+        );
     }
 }
 
 const StatelessNext: NextStatelessComponent<NextComponentProps> = ({ example }) => (
     <div>I'm a stateless component! {example}</div>
-)
+);
 
 StatelessNext.getInitialProps = async () => {
-    return { example: 'example' }
-}
+    return { example: 'example' };
+};

From 3c5384acca044e06c4e214cf5b113b139a95cb7c Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Fri, 11 May 2018 23:12:07 +0700
Subject: [PATCH 013/141] [next] Added AppComponentContext type

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

diff --git a/types/next/app.d.ts b/types/next/app.d.ts
index 6d10d77af8..512c5f996f 100644
--- a/types/next/app.d.ts
+++ b/types/next/app.d.ts
@@ -1,10 +1,17 @@
 import * as React from "react";
+import { NextContext } from "next";
 
 export interface AppComponentProps {
     Component: React.ComponentType<any>;
     pageProps: any
 }
 
+export interface AppComponentContext {
+    Component: any;
+    router: any; // TODO: could be SingletonRouter?
+    ctx: NextContext;
+}
+
 export class Container extends React.Component {}
 
 export default class App<P = {}> extends React.Component<P & AppComponentProps> {}

From f3d3de950904a3e46137c31a222e1b2d4b4d4841 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Fri, 11 May 2018 23:16:42 +0700
Subject: [PATCH 014/141] [next] include app.d.ts in bundle

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

diff --git a/types/next/tsconfig.json b/types/next/tsconfig.json
index 36aef39491..125953fcd6 100644
--- a/types/next/tsconfig.json
+++ b/types/next/tsconfig.json
@@ -20,6 +20,7 @@
     },
     "files": [
         "index.d.ts",
+        "app.d.ts",
         "document.d.ts",
         "dynamic.d.ts",
         "error.d.ts",

From 92db478980b2221b31f995a0658191902ba9bb4f Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Fri, 11 May 2018 23:17:40 +0700
Subject: [PATCH 015/141] [next] re-run dtslint

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

diff --git a/types/next/app.d.ts b/types/next/app.d.ts
index 512c5f996f..0296440ddb 100644
--- a/types/next/app.d.ts
+++ b/types/next/app.d.ts
@@ -1,9 +1,9 @@
 import * as React from "react";
-import { NextContext } from "next";
+import { NextContext } from ".";
 
 export interface AppComponentProps {
     Component: React.ComponentType<any>;
-    pageProps: any
+    pageProps: any;
 }
 
 export interface AppComponentContext {

From 28b1367d70342534ff1bcd2ecedcc27b0da2f6d5 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Sat, 12 May 2018 11:51:42 +0700
Subject: [PATCH 016/141] [next] fix tests (getInitialProps should be static)

---
 types/next/test/next-component-tests.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/next/test/next-component-tests.tsx b/types/next/test/next-component-tests.tsx
index a6e870f8e2..fefde092ea 100644
--- a/types/next/test/next-component-tests.tsx
+++ b/types/next/test/next-component-tests.tsx
@@ -6,7 +6,7 @@ interface NextComponentProps {
 }
 
 class ClassNext extends React.Component<NextComponentProps> {
-    async getInitialProps() {
+    static async getInitialProps() {
         return { example: 'example' };
     }
 

From 9d68e22a0c62fbd58869ab901ad09badf8eb6dcf Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Wed, 16 May 2018 21:57:28 +0700
Subject: [PATCH 017/141] [next] separate context objects for Document + fix
 tests

---
 types/next/document.d.ts                | 13 +++++++++
 types/next/index.d.ts                   |  6 ----
 types/next/test/next-document-tests.tsx | 38 +++++++++++++++++++++----
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/types/next/document.d.ts b/types/next/document.d.ts
index 4696819626..01344de7c8 100644
--- a/types/next/document.d.ts
+++ b/types/next/document.d.ts
@@ -1,4 +1,5 @@
 import * as React from "react";
+import { NextContext } from ".";
 
 export interface DocumentProps {
     __NEXT_DATA__?: any;
@@ -9,6 +10,18 @@ export interface DocumentProps {
     [key: string]: any;
 }
 
+/**
+ * Context object used inside `Document`
+ */
+export interface NextDocumentContext extends NextContext {
+    /** A callback that executes the actual React rendering logic (synchronously) */
+    renderPage(
+        cb?: (enhancer: () => JSX.Element) => React.ComponentType<any>
+    ): {
+        [key: string]: any
+    };
+}
+
 export class Head extends React.Component<any> {}
 export class Main extends React.Component {}
 export class NextScript extends React.Component {}
diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 939dc27bdb..6679420ba3 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -36,12 +36,6 @@ declare namespace next {
         jsonPageRes?: NodeResponse;
         /** Error object if any error is encountered during the rendering */
         err?: Error;
-        /** a callback that executes the actual React rendering logic (synchronously) */
-        renderPage(
-            cb?: (enhancer: () => JSX.Element) => React.ComponentType<any>
-        ): {
-            [key: string]: any
-        };
     }
 
     type NextSFC<P = {}> = NextStatelessComponent<P>;
diff --git a/types/next/test/next-document-tests.tsx b/types/next/test/next-document-tests.tsx
index 0177d1d451..2b3257cd25 100644
--- a/types/next/test/next-document-tests.tsx
+++ b/types/next/test/next-document-tests.tsx
@@ -1,12 +1,40 @@
-import Document, * as document from "next/document";
+import Document, { Head, Main, NextScript, NextDocumentContext } from 'next/document';
 import * as React from "react";
 
 const results = (
     <Document any="property" should="work" here>
-        <document.Head some="more" properties>
+        <Head some="more" properties>
             <meta name="description" content="Head can have children, too!" />
-        </document.Head>
-        <document.Main />
-        <document.NextScript />
+        </Head>
+        <Main />
+        <NextScript />
     </Document>
 );
+
+const Wrapper: React.SFC = ({ children }) => <React.Fragment>{children}</React.Fragment>;
+
+export default class MyDocument extends Document {
+    static async getInitialProps({ renderPage }: NextDocumentContext) {
+        // Without callback
+        const page = renderPage();
+        // With callback
+        const differentPage = renderPage(App => props => <Wrapper><App {...props} /></Wrapper>);
+        const style = {};
+        return { ...page, style };
+    }
+
+    render() {
+        return (
+            <html>
+                <Head>
+                    <title>My page</title>
+                    <style id='cxs-style' dangerouslySetInnerHTML={{ __html: this.props.style }} />
+                </Head>
+                <body>
+                    <Main />
+                    <NextScript />
+                </body>
+            </html>
+        );
+    }
+}

From 3ebc1ac0b32e096cb40ebf006d6b009a22c3ab88 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Wed, 16 May 2018 22:03:51 +0700
Subject: [PATCH 018/141] [next] stateless -> class

---
 types/next/test/next-component-tests.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/next/test/next-component-tests.tsx b/types/next/test/next-component-tests.tsx
index fefde092ea..8e1d6178fb 100644
--- a/types/next/test/next-component-tests.tsx
+++ b/types/next/test/next-component-tests.tsx
@@ -12,7 +12,7 @@ class ClassNext extends React.Component<NextComponentProps> {
 
     render() {
         return (
-            <div>I'm a stateless component! {this.props.example}</div>
+            <div>I'm a class component! {this.props.example}</div>
         );
     }
 }

From c2e993e18763c8a33d2a755d4a47a7d8ff85651a Mon Sep 17 00:00:00 2001
From: Lyle Johnson <lyle.johnson@synapsewireless.com>
Date: Thu, 31 May 2018 10:28:03 -0500
Subject: [PATCH 019/141] Updated index.d.ts for 'luxon'

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

diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index d90ba90b13..94623c5abb 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -208,6 +208,7 @@ declare module 'luxon' {
             toLocaleParts(options?: DateTimeFormatOptions): any[];
             toLocaleString(options?: DateTimeFormatOptions): string;
             toObject(options?: { includeConfig?: boolean }): DateObject;
+            toMillis(): number;
             toRFC2822(): string;
             toSQL(options?: Object): string;
             toSQLDate(): string;

From a13bdd24337a54906f754af92c8d5967c32c0e39 Mon Sep 17 00:00:00 2001
From: Lyle Johnson <lyle.johnson@synapsewireless.com>
Date: Thu, 31 May 2018 10:34:47 -0500
Subject: [PATCH 020/141] Add sanity tests for DateTime#fromMillis() and
 DateTime#toMillis()

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

diff --git a/types/luxon/luxon-tests.ts b/types/luxon/luxon-tests.ts
index ce9d09ac8f..4396e8d7a2 100644
--- a/types/luxon/luxon-tests.ts
+++ b/types/luxon/luxon-tests.ts
@@ -54,6 +54,8 @@ DateTime.utc();
 DateTime.local().toUTC();
 DateTime.utc().toLocal();
 
+DateTime.fromMillis(1527780819458).toMillis();
+
 /* Duration */
 const dur = Duration.fromObject({ hours: 2, minutes: 7 });
 dt.plus(dur);

From f7ec364364940de03ca3ab321fae53c9407b82b7 Mon Sep 17 00:00:00 2001
From: Lyle Johnson <lyle.johnson@synapsewireless.com>
Date: Thu, 31 May 2018 10:43:11 -0500
Subject: [PATCH 021/141] Bump version number for types/luxon/index.d.ts from
 0.5.2 to 0.5.3

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

diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index 94623c5abb..e71f89f106 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for luxon 0.5
+// Type definitions for luxon 0.5.3
 // Project: https://github.com/moment/luxon#readme
 // Definitions by: Colby DeHart <https://github.com/colbydehart>
 //                 Hyeonseok Yang <https://github.com/FourwingsY>

From 1e4d390d8af0da0bcc75750d905404da80ed8ec2 Mon Sep 17 00:00:00 2001
From: James Johnson <james.johnson@infoplanit.com>
Date: Sat, 2 Jun 2018 14:34:03 -0500
Subject: [PATCH 022/141] Updates declaration of jquery-mockjax to the latest
 github/npm release

Also adds tests for two features added in the release.
---
 types/jquery-mockjax/index.d.ts              | 14 +++++-
 types/jquery-mockjax/jquery-mockjax-tests.ts | 48 ++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/types/jquery-mockjax/index.d.ts b/types/jquery-mockjax/index.d.ts
index 54cc036416..78e572b539 100644
--- a/types/jquery-mockjax/index.d.ts
+++ b/types/jquery-mockjax/index.d.ts
@@ -1,6 +1,9 @@
-// Type definitions for jQuery Mockjax 2.0.1
+// Type definitions for jQuery Mockjax 2.3
 // Project: https://github.com/jakerella/jquery-mockjax
-// Definitions by: Laszlo Jakab <https://github.com/laszlojakab>, Vladimir Đokić <https://github.com/vladeck>
+// Definitions by: 
+//                 Laszlo Jakab <https://github.com/laszlojakab>, 
+//                 Vladimir Đokić <https://github.com/vladeck>,
+//                 James Johnson <https://github.com/hasaki>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -33,15 +36,22 @@ interface MockJaxSettings {
     onAfterSuccess?: Function;
     onAfterError?: Function;
     onAfterComplete?: Function;
+    logger?: any;
+    logLevelMethods?: string[];
+    namespace?: string;
+    throwUnmocked?: boolean;
+    retainAjaxCalls?: boolean;
 }
 
 interface MockJaxStatic {
     (options: MockJaxSettings): number;
+    (options: MockJaxSettings[]): number[];
     handler(id?: number): any;
     clear(id?: number): void;
     mockedAjaxCalls(): any[];
     unfiredHandlers(): any[];
     unmockedAjaxCalls(): any[];
+    clearRetainedAjaxCalls(): void;
 }
 
 interface JQueryStatic {
diff --git a/types/jquery-mockjax/jquery-mockjax-tests.ts b/types/jquery-mockjax/jquery-mockjax-tests.ts
index 3090a1c3cc..e3bdfd5599 100644
--- a/types/jquery-mockjax/jquery-mockjax-tests.ts
+++ b/types/jquery-mockjax/jquery-mockjax-tests.ts
@@ -192,6 +192,54 @@ class Tests {
                 }
             });
         });
+
+        t('Custom logger gets called', (assert) => {
+            let done = assert.async();
+            let wasLoggerCalled = false;
+
+            let logFunction = () => wasLoggerCalled = true;
+
+            let settings: MockJaxSettings = {
+                url: '/custom-logging-function',
+                logging: true,
+                logger: {
+                    error: logFunction,
+                    warn: logFunction,
+                    info: logFunction,
+                    log: logFunction,
+                    debug: logFunction
+                }
+            };
+
+            $.mockjax(settings);
+
+            $.ajax({
+                url: '/custom-logging-function',
+                error: self._noErrorCallbackExpected,
+                complete: (xhr) => {
+                    assert.equal(wasLoggerCalled, true, 'Custom logger was called');
+                    done();
+                }
+            });
+        });
+
+        t('Throws when ajax call is not mocked', (assert) => {
+            let done = assert.async();
+
+            $.mockjaxSettings.throwUnmocked = true;
+
+            $.ajax({
+                url: '/unmocked-ajax-call',
+                error: (error) => {
+                    assert.ok(error, 'Expected the call to fail because it was not mocked');
+                    done();
+                },
+                complete: (xhr) => {
+                    assert.ok(false, 'Expected a failure');
+                    done();
+                }
+            });
+        });
     }
 }
 

From b000f9a36bc03de58519502b022c30a6abe8f547 Mon Sep 17 00:00:00 2001
From: James Johnson <james.johnson@infoplanit.com>
Date: Sat, 2 Jun 2018 14:42:06 -0500
Subject: [PATCH 023/141] Adds .0 to revision to match npm version

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

diff --git a/types/jquery-mockjax/index.d.ts b/types/jquery-mockjax/index.d.ts
index 78e572b539..d2a4ec2f7c 100644
--- a/types/jquery-mockjax/index.d.ts
+++ b/types/jquery-mockjax/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQuery Mockjax 2.3
+// Type definitions for jQuery Mockjax 2.3.0
 // Project: https://github.com/jakerella/jquery-mockjax
 // Definitions by: 
 //                 Laszlo Jakab <https://github.com/laszlojakab>, 

From 11d193de2628cafe46b89a1f629ea9db3eb28505 Mon Sep 17 00:00:00 2001
From: Cerberuser <computers05@mail.ru>
Date: Mon, 4 Jun 2018 08:54:24 +0700
Subject: [PATCH 024/141] Update cytoscape-tests.ts

Added a whole set of options for startup
---
 types/cytoscape/cytoscape-tests.ts | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/types/cytoscape/cytoscape-tests.ts b/types/cytoscape/cytoscape-tests.ts
index 25d6151259..71e815208c 100644
--- a/types/cytoscape/cytoscape-tests.ts
+++ b/types/cytoscape/cytoscape-tests.ts
@@ -68,7 +68,35 @@ const cy = cytoscape({
       { data: { id: 'eb', source: 'e', target: 'b' } }
     ]
   },
+  
+  // initial viewport state:
+  zoom: 1,
+  pan: { x: 0, y: 0 },
 
+  // interaction options:
+  minZoom: 1e-50,
+  maxZoom: 1e50,
+  zoomingEnabled: true,
+  userZoomingEnabled: true,
+  panningEnabled: true,
+  userPanningEnabled: true,
+  selectionType: 'single',
+  touchTapThreshold: 8,
+  desktopTapThreshold: 4,
+  autolock: false,
+  autoungrabify: false,
+
+  // rendering options:
+  headless: false,
+  styleEnabled: true,
+  hideEdgesOnViewport: false,
+  hideLabelsOnViewport: false,
+  textureOnViewport: false,
+  motionBlur: false,
+  motionBlurOpacity: 0.2,
+  wheelSensitivity: 1,
+  pixelRatio: 'auto',
+    
   layout: {
     name: 'preset',
     padding: 5

From abd1eed3c30219f96dcee505a909e7dcd3e981e2 Mon Sep 17 00:00:00 2001
From: Troy McKinnon <troy.t.mckinnon@gmail.com>
Date: Mon, 4 Jun 2018 13:38:20 -0500
Subject: [PATCH 025/141] Fix snapsvg function name toDataURL

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

diff --git a/types/snapsvg/index.d.ts b/types/snapsvg/index.d.ts
index 540729f410..900d5416e6 100644
--- a/types/snapsvg/index.d.ts
+++ b/types/snapsvg/index.d.ts
@@ -280,7 +280,7 @@ declare namespace Snap {
         mask(varargs:any):Object;
         ptrn(x:number,y:number,width:number,height:number,vbx:number,vby:number,vbw:number,vbh:number):Object;
         svg(x:number,y:number,width:number,height:number,vbx:number,vby:number,vbw:number,vbh:number):Object;
-        toDataUrl(): string;
+        toDataURL(): string;
         toString():string;
         use(id?:string):Object;
         use(id?:Snap.Element):Object;

From 78a562824494e8ef19a22cb91e50fc411667d89b Mon Sep 17 00:00:00 2001
From: Gergely Gombos <gombosg@gmail.com>
Date: Tue, 5 Jun 2018 12:46:55 +0200
Subject: [PATCH 026/141] Added 'session' property to Puppeteer cookies.

Sources:
https://github.com/GoogleChrome/puppeteer/blob/v1.4.0/docs/api.md#pagecookiesurls
https://chromedevtools.github.io/devtools-protocol/tot/Network#type-Cookie
---
 types/puppeteer/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 510ae37107..1dbccd0cda 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -189,6 +189,8 @@ export interface Cookie {
   expires: number;
   /** The cookie http only flag. */
   httpOnly: boolean;
+  /** The session cookie flag. */
+  session: boolean;
   /** The cookie secure flag. */
   secure: boolean;
   /** The cookie same site definition. */
@@ -219,6 +221,8 @@ export interface SetCookie {
   expires?: number;
   /** The cookie http only flag. */
   httpOnly?: boolean;
+  /** The session cookie flag. */
+  session?: boolean;
   /** The cookie secure flag. */
   secure?: boolean;
   /** The cookie same site definition. */

From fb87b7f625d49761f3454c0a0e7a4b5e1cbdb635 Mon Sep 17 00:00:00 2001
From: Josh Duff <me@JoshDuff.com>
Date: Tue, 5 Jun 2018 10:20:18 -0500
Subject: [PATCH 027/141] Promise.resolve does not require an argument

The p-defer library is just exposing the Promise `resolve` function, which does not require an argument.
---
 types/p-defer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/p-defer/index.d.ts b/types/p-defer/index.d.ts
index 54ba6dd98b..7eff607e7d 100644
--- a/types/p-defer/index.d.ts
+++ b/types/p-defer/index.d.ts
@@ -5,7 +5,7 @@
 
 declare namespace pDefer {
 	interface DeferredPromise<T> {
-		resolve<U>(value: U | PromiseLike<U>): Promise<U>;
+		resolve<U>(value?: U | PromiseLike<U>): Promise<U>;
 		reject(reason: any): Promise<never>;
 		promise: Promise<T>;
 	}

From 424dc0ec03c79e978b8f4bbd192f16ab0bd69236 Mon Sep 17 00:00:00 2001
From: Josh Duff <me@JoshDuff.com>
Date: Tue, 5 Jun 2018 10:36:03 -0500
Subject: [PATCH 028/141] Test for calling p-defer's resolve without any
 arguments

---
 types/p-defer/p-defer-tests.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/p-defer/p-defer-tests.ts b/types/p-defer/p-defer-tests.ts
index ad6c771590..9ea4647620 100644
--- a/types/p-defer/p-defer-tests.ts
+++ b/types/p-defer/p-defer-tests.ts
@@ -7,3 +7,7 @@ function delay(deferred: pDefer.DeferredPromise<string>,  ms: number) {
 
 let s: string;
 async function f() { s = await delay(pDefer<string>(), 100); }
+
+async function u() {
+	const u: Promise<any> = pDefer().resolve();
+}

From b3e178b990e3ec1ed70d7be423d28a1129ae2c67 Mon Sep 17 00:00:00 2001
From: Martin Hochel <hochelmartin@gmail.com>
Date: Wed, 6 Jun 2018 00:27:11 +0200
Subject: [PATCH 029/141] fix(jest): fix ProjectConfig.transform type

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index af86996795..b7b60f2e53 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -13,6 +13,7 @@
 //                 Ahn <https://github.com/AhnpGit>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 //                 Bradley Ayers <https://github.com/bradleyayers>
+//                 Martin Hochel <https://github.com/hotell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -795,6 +796,7 @@ declare namespace jest {
 
     type SnapshotUpdateState = 'all' | 'new' | 'none';
 
+    // https://facebook.github.io/jest/docs/en/cli.html#options
     interface GlobalConfig {
         bail: boolean;
         collectCoverage: boolean;
@@ -824,6 +826,7 @@ declare namespace jest {
         watchman: boolean;
     }
 
+    // https://facebook.github.io/jest/docs/en/configuration.html#options
     interface ProjectConfig {
         automock: boolean;
         browser: boolean;
@@ -863,7 +866,7 @@ declare namespace jest {
         testRunner: string;
         testURL: string;
         timers: 'real' | 'fake';
-        transform: Array<[string, Path]>;
+        transform: {[regexpGlob: string]: string};
         transformIgnorePatterns: Glob[];
         unmockedModulePathPatterns: Maybe<string[]>;
         watchPathIgnorePatterns: string[];
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index a90a7a9e5a..b8dff71522 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -731,3 +731,24 @@ test('moduleName 2', () => {
     const moduleName = require('../moduleName');
     expect(moduleName()).toEqual(2);
 });
+
+// Jest config
+{
+// tslint:disable-next-line:no-var-requires
+const {defaults} = require('jest-config') as {defaults: jest.ProjectConfig};
+
+const config: Partial<jest.ProjectConfig> = {
+  transform: {
+    '^.+\\.(ts|tsx)$': 'ts-jest'
+  },
+  testMatch: [
+    ...defaults.testMatch,
+    '**/__tests__/**/*.ts?(x)',
+    '**/?(*.)+(spec|test).ts?(x)'
+  ],
+  moduleFileExtensions: [...defaults.moduleFileExtensions, 'ts', 'tsx'],
+  globals: {
+    'ts-jest': {}
+  }
+};
+}

From 3b60e1932f6090b66e3873e00bf219d88422b8d2 Mon Sep 17 00:00:00 2001
From: James Johnson <james.johnson@infoplanit.com>
Date: Tue, 5 Jun 2018 19:17:26 -0500
Subject: [PATCH 030/141] Updates declaration to include specific types for the
 logger object.

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

diff --git a/types/jquery-mockjax/index.d.ts b/types/jquery-mockjax/index.d.ts
index d2a4ec2f7c..f1333b1028 100644
--- a/types/jquery-mockjax/index.d.ts
+++ b/types/jquery-mockjax/index.d.ts
@@ -9,6 +9,20 @@
 
 /// <reference types="jquery" />
 
+type MockJaxLoggingFunction = (message?: any, ...additionalParameters: any[]) => void;
+
+interface MockJaxStandardLogger {
+    error?: MockJaxLoggingFunction;
+    warn?: MockJaxLoggingFunction;
+    info?: MockJaxLoggingFunction;
+    log?: MockJaxLoggingFunction;
+    debug?: MockJaxLoggingFunction;
+}
+
+interface MockJaxCustomLogger {
+    [key: string]: MockJaxLoggingFunction;
+}
+
 interface MockJaxSettingsHeaders {
     [key: string]: string;
 }
@@ -36,7 +50,7 @@ interface MockJaxSettings {
     onAfterSuccess?: Function;
     onAfterError?: Function;
     onAfterComplete?: Function;
-    logger?: any;
+    logger?: MockJaxStandardLogger | MockJaxCustomLogger;
     logLevelMethods?: string[];
     namespace?: string;
     throwUnmocked?: boolean;
diff --git a/types/jquery-mockjax/jquery-mockjax-tests.ts b/types/jquery-mockjax/jquery-mockjax-tests.ts
index e3bdfd5599..31babd9cd8 100644
--- a/types/jquery-mockjax/jquery-mockjax-tests.ts
+++ b/types/jquery-mockjax/jquery-mockjax-tests.ts
@@ -193,7 +193,7 @@ class Tests {
             });
         });
 
-        t('Custom logger gets called', (assert) => {
+        t('Standard logger type gets called', (assert) => {
             let done = assert.async();
             let wasLoggerCalled = false;
 
@@ -213,6 +213,33 @@ class Tests {
 
             $.mockjax(settings);
 
+            $.ajax({
+                url: '/custom-logging-function',
+                error: self._noErrorCallbackExpected,
+                complete: (xhr) => {
+                    assert.equal(wasLoggerCalled, true, 'Standard logger was called');
+                    done();
+                }
+            });
+        });
+
+        t('Custom logger object gets called', (assert) => {
+            let done = assert.async();
+            let wasLoggerCalled = false;
+
+            let logFunction = () => wasLoggerCalled = true;
+
+            let settings: MockJaxSettings = {
+                url: '/custom-logging-function',
+                logging: true,
+                logger: {
+                    customName: logFunction
+                },
+                logLevelMethods: ['customName', 'customName', 'customName', 'customName', 'customName']
+            };
+
+            $.mockjax(settings);
+
             $.ajax({
                 url: '/custom-logging-function',
                 error: self._noErrorCallbackExpected,

From faa9a6b089d9780014fb4a1749f1c6174e27215e Mon Sep 17 00:00:00 2001
From: Steffen Kowalski <scipper@myscipper.de>
Date: Wed, 6 Jun 2018 14:13:31 +0200
Subject: [PATCH 031/141] Added new featured to $rootScope from 1.6.10

https://github.com/angular/angular.js/blob/master/CHANGELOG.md#1610-crystalline-persuasion-2018-04-17
---
 types/angular/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 6dccefc926..1133c46410 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -484,6 +484,9 @@ declare namespace angular {
         $broadcast(name: string, ...args: any[]): IAngularEvent;
         $destroy(): void;
         $digest(): void;
+        $suspend(): void;
+        $isSuspended(): boolean;
+        $resume(): void;
         /**
          * Dispatches an event name upwards through the scope hierarchy notifying the registered $rootScope.Scope listeners.
          *

From 43448845ed60d8e2672bc2ebfd531f70ece68402 Mon Sep 17 00:00:00 2001
From: Steffen Kowalski <scipper@myscipper.de>
Date: Wed, 6 Jun 2018 14:14:35 +0200
Subject: [PATCH 032/141] Added myself to "Definitions by"

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

diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 1133c46410..658a97e315 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -4,6 +4,7 @@
 //                 Georgii Dolzhykov <https://github.com/thorn0>
 //                 Caleb St-Denis <https://github.com/calebstdenis>
 //                 Leonard Thieu <https://github.com/leonard-thieu>
+//                 Steffen Kowalski <https://github.com/scipper>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From ef970e72adaf630f292503e2dfd56ad7f155897f Mon Sep 17 00:00:00 2001
From: Steffen Kowalski <scipper@myscipper.de>
Date: Wed, 6 Jun 2018 15:27:16 +0200
Subject: [PATCH 033/141] added docs to $suspend, $isSuspended and $resume

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

diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 658a97e315..5ba41ba04e 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -485,9 +485,91 @@ declare namespace angular {
         $broadcast(name: string, ...args: any[]): IAngularEvent;
         $destroy(): void;
         $digest(): void;
+                
+        /**
+         * @ngdoc method
+         * @name $rootScope.Scope#$suspend
+         * @kind function
+         *
+         * @description
+         * Suspend watchers of this scope subtree so that they will not be invoked during digest.
+         *
+         * This can be used to optimize your application when you know that running those watchers
+         * is redundant.
+         *
+         * **Warning**
+         *
+         * Suspending scopes from the digest cycle can have unwanted and difficult to debug results.
+         * Only use this approach if you are confident that you know what you are doing and have
+         * ample tests to ensure that bindings get updated as you expect.
+         *
+         * Some of the things to consider are:
+         *
+         * * Any external event on a directive/component will not trigger a digest while the hosting
+         *   scope is suspended - even if the event handler calls `$apply()` or `$rootScope.$digest()`.
+         * * Transcluded content exists on a scope that inherits from outside a directive but exists
+         *   as a child of the directive's containing scope. If the containing scope is suspended the
+         *   transcluded scope will also be suspended, even if the scope from which the transcluded
+         *   scope inherits is not suspended.
+         * * Multiple directives trying to manage the suspended status of a scope can confuse each other:
+         *    * A call to `$suspend()` on an already suspended scope is a no-op.
+         *    * A call to `$resume()` on a non-suspended scope is a no-op.
+         *    * If two directives suspend a scope, then one of them resumes the scope, the scope will no
+         *      longer be suspended. This could result in the other directive believing a scope to be
+         *      suspended when it is not.
+         * * If a parent scope is suspended then all its descendants will be also excluded from future
+         *   digests whether or not they have been suspended themselves. Note that this also applies to
+         *   isolate child scopes.
+         * * Calling `$digest()` directly on a descendant of a suspended scope will still run the watchers
+         *   for that scope and its descendants. When digesting we only check whether the current scope is
+         *   locally suspended, rather than checking whether it has a suspended ancestor.
+         * * Calling `$resume()` on a scope that has a suspended ancestor will not cause the scope to be
+         *   included in future digests until all its ancestors have been resumed.
+         * * Resolved promises, e.g. from explicit `$q` deferreds and `$http` calls, trigger `$apply()`
+         *   against the `$rootScope` and so will still trigger a global digest even if the promise was
+         *   initiated by a component that lives on a suspended scope.
+         */
         $suspend(): void;
+                
+        /**
+         * @ngdoc method
+         * @name $rootScope.Scope#$isSuspended
+         * @kind function
+         *
+         * @description
+         * Call this method to determine if this scope has been explicitly suspended. It will not
+         * tell you whether an ancestor has been suspended.
+         * To determine if this scope will be excluded from a digest triggered at the $rootScope,
+         * for example, you must check all its ancestors:
+         *
+         * ```
+         * function isExcludedFromDigest(scope) {
+         *   while(scope) {
+         *     if (scope.$isSuspended()) return true;
+         *     scope = scope.$parent;
+         *   }
+         *   return false;
+         * ```
+         *
+         * Be aware that a scope may not be included in digests if it has a suspended ancestor,
+         * even if `$isSuspended()` returns false.
+         *
+         * @returns true if the current scope has been suspended.
+         */
         $isSuspended(): boolean;
+                
+        /**
+         * @ngdoc method
+         * @name $rootScope.Scope#$resume
+         * @kind function
+         *
+         * @description
+         * Resume watchers of this scope subtree in case it was suspended.
+         *
+         * See {@link $rootScope.Scope#$suspend} for information about the dangers of using this approach.
+         */
         $resume(): void;
+                
         /**
          * Dispatches an event name upwards through the scope hierarchy notifying the registered $rootScope.Scope listeners.
          *

From 5f56a0a59ff6eb7e095ff61c3c4a9bcd84226653 Mon Sep 17 00:00:00 2001
From: Jason Merino <jason.merino@build.com>
Date: Wed, 6 Jun 2018 07:56:33 -0700
Subject: [PATCH 034/141] Adds more id types and type prop to
 react-native-navigation NavigatorEvent.

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

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 3edf071e98..c4a7a4419d 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -119,7 +119,8 @@ export interface LightBox {
 }
 
 export interface NavigatorEvent {
-    id: 'willAppear' | 'didAppear' | 'willDisappear' | 'didDisappear' | 'willCommitPreview' | 'backPress';
+    id: 'willAppear' | 'didAppear' | 'willDisappear' | 'didDisappear' | 'willCommitPreview' | 'backPress' | 'bottomTabSelected' | 'bottomTabReselected' | string;
+    type: 'NavBarButtonPress' | 'DeepLink';
 }
 
 export class Navigator {

From 87529593e42c702a8033e8dd93616a7da7828e70 Mon Sep 17 00:00:00 2001
From: Jason Merino <jason.merino@build.com>
Date: Wed, 6 Jun 2018 08:12:09 -0700
Subject: [PATCH 035/141] Add tests.

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

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index c4a7a4419d..cf2225a0a3 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-native-navigation 1.1
 // Project: https://github.com/wix/react-native-navigation
 // Definitions by: Egor Shulga <https://github.com/egorshulga>
+//                 Jason Merino <https://github.com/jasonmerino>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
index e99bfd47dc..91ab4088e8 100644
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ b/types/react-native-navigation/react-native-navigation-tests.tsx
@@ -20,6 +20,8 @@ class Screen1 extends React.Component<Props> {
     onNavigatorEvent = (event: NavigatorEvent) => {
         if (event.id === 'willAppear') {
             console.log('will appear');
+        } else if (event.type === 'NavBarButtonPress' && event.id === 'sideMenu') {
+            console.log('side menu pressed');
         }
     }
 

From 12beafcc7d2f5c14ee8a7d034817c2d410ee7638 Mon Sep 17 00:00:00 2001
From: Jason Merino <jason.merino@build.com>
Date: Wed, 6 Jun 2018 08:23:18 -0700
Subject: [PATCH 036/141] Bumps version number.

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

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index cf2225a0a3..fa23a9cb79 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-native-navigation 1.1
+// Type definitions for react-native-navigation 1.1.1
 // Project: https://github.com/wix/react-native-navigation
 // Definitions by: Egor Shulga <https://github.com/egorshulga>
 //                 Jason Merino <https://github.com/jasonmerino>

From 2a35196c9234ec4ee5226bedd873aae07dfa17b1 Mon Sep 17 00:00:00 2001
From: Jason Merino <jason.merino@build.com>
Date: Wed, 6 Jun 2018 08:25:35 -0700
Subject: [PATCH 037/141] Undo version bump.

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

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index fa23a9cb79..cf2225a0a3 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-native-navigation 1.1.1
+// Type definitions for react-native-navigation 1.1
 // Project: https://github.com/wix/react-native-navigation
 // Definitions by: Egor Shulga <https://github.com/egorshulga>
 //                 Jason Merino <https://github.com/jasonmerino>

From 3a411662084b68d38b20b8328f72f9cba5cc09c1 Mon Sep 17 00:00:00 2001
From: Lyle Johnson <lyle.johnson@synapsewireless.com>
Date: Wed, 6 Jun 2018 11:45:39 -0500
Subject: [PATCH 038/141] remove patchlevel change from version number

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

diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index e71f89f106..94623c5abb 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for luxon 0.5.3
+// Type definitions for luxon 0.5
 // Project: https://github.com/moment/luxon#readme
 // Definitions by: Colby DeHart <https://github.com/colbydehart>
 //                 Hyeonseok Yang <https://github.com/FourwingsY>

From 357c5f1e9007dec322f11fb01701afdf18049cd5 Mon Sep 17 00:00:00 2001
From: Tom Milligan <code@tommilligan.net>
Date: Wed, 6 Jun 2018 19:32:18 +0100
Subject: [PATCH 039/141] recharts X/YAxis label prop can be of type LabelProps

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 342c1a07bb..738c04bb02 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -910,7 +910,7 @@ export interface XAxisProps extends EventAttributes {
     interval?: AxisInterval;
     reversed?: boolean;
     // see label section at http://recharts.org/#/en-US/api/XAxis
-    label?: string | number | Label;
+    label?: string | number | Label | LabelProps;
 }
 
 export class XAxis extends React.Component<XAxisProps> { }
@@ -961,7 +961,7 @@ export interface YAxisProps extends EventAttributes {
     interval?: AxisInterval;
     reversed?: boolean;
     // see label section at http://recharts.org/#/en-US/api/YAxis
-    label?: string | number | Label;
+    label?: string | number | Label | LabelProps;
 }
 
 export class YAxis extends React.Component<YAxisProps> { }
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 7fdf37115f..17d49bbd11 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -136,12 +136,8 @@ class Component extends React.Component<{}, ComponentState> {
                 </ResponsiveContainer>
                 <ResponsiveContainer>
                     <LineChart width={500} height={300} data={data}>
-                        <XAxis dataKey="name">
-                            <Label>X axis - name</Label>
-                        </XAxis>
-                        <YAxis>
-                            <Label>Y axis</Label>
-                        </YAxis>
+                        <XAxis dataKey="name" label={{ value: "X axis - name" }} />
+                        <YAxis label={{ value: "Y axis" }} />
                         <CartesianGrid stroke="#eee" strokeDasharray="5 5"  />
                         <Line type="monotone" dataKey="uv" stroke="#8884d8" onClick={ this.clickHandler } />
                         <Line type="monotone" dataKey="pv" stroke="#82ca9d" />

From ce7505a1d1bb41f1e1901310a5cc8d7870a04ac9 Mon Sep 17 00:00:00 2001
From: Steffen Kowalski <skowalski@integrationmatters.com>
Date: Thu, 7 Jun 2018 09:31:07 +0200
Subject: [PATCH 040/141] fixed errors in @types/angular

---
 types/angular/index.d.ts | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 5ba41ba04e..56a4c46483 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -485,13 +485,8 @@ declare namespace angular {
         $broadcast(name: string, ...args: any[]): IAngularEvent;
         $destroy(): void;
         $digest(): void;
-                
+
         /**
-         * @ngdoc method
-         * @name $rootScope.Scope#$suspend
-         * @kind function
-         *
-         * @description
          * Suspend watchers of this scope subtree so that they will not be invoked during digest.
          *
          * This can be used to optimize your application when you know that running those watchers
@@ -530,13 +525,8 @@ declare namespace angular {
          *   initiated by a component that lives on a suspended scope.
          */
         $suspend(): void;
-                
+
         /**
-         * @ngdoc method
-         * @name $rootScope.Scope#$isSuspended
-         * @kind function
-         *
-         * @description
          * Call this method to determine if this scope has been explicitly suspended. It will not
          * tell you whether an ancestor has been suspended.
          * To determine if this scope will be excluded from a digest triggered at the $rootScope,
@@ -557,19 +547,14 @@ declare namespace angular {
          * @returns true if the current scope has been suspended.
          */
         $isSuspended(): boolean;
-                
+
         /**
-         * @ngdoc method
-         * @name $rootScope.Scope#$resume
-         * @kind function
-         *
-         * @description
          * Resume watchers of this scope subtree in case it was suspended.
          *
-         * See {@link $rootScope.Scope#$suspend} for information about the dangers of using this approach.
+         * See {$rootScope.Scope#$suspend} for information about the dangers of using this approach.
          */
         $resume(): void;
-                
+
         /**
          * Dispatches an event name upwards through the scope hierarchy notifying the registered $rootScope.Scope listeners.
          *

From 41a81feb2dfd047552718a4ad7e020349001c9f8 Mon Sep 17 00:00:00 2001
From: Thomas Baumann <thomas.baumann@bertschi.com>
Date: Thu, 7 Jun 2018 11:23:59 +0200
Subject: [PATCH 041/141] meteor: Allow collection without connection

The connection option can be null to define a local collection

https://docs.meteor.com/api/collections.html#Mongo-Collection
https://guide.meteor.com/collections.html#local-collections
---
 types/meteor/meteor-tests.ts | 5 +++++
 types/meteor/mongo.d.ts      | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/meteor/meteor-tests.ts b/types/meteor/meteor-tests.ts
index f9cf039c84..a321e4a409 100644
--- a/types/meteor/meteor-tests.ts
+++ b/types/meteor/meteor-tests.ts
@@ -781,3 +781,8 @@ DDPRateLimiter.addRule({ userId: 'foo' }, 5, 1000);
 DDPRateLimiter.addRule({ userId: userId => userId == 'foo' }, 5, 1000);
 
 Template.instance().autorun(() => { }).stop();
+
+// Mongo Collection without connection (local collection)
+const collectionWithoutConnection = new Mongo.Collection<MonkeyDAO>("monkey", {
+    connection: null
+});
diff --git a/types/meteor/mongo.d.ts b/types/meteor/mongo.d.ts
index 248f5a22af..771d24edc1 100644
--- a/types/meteor/mongo.d.ts
+++ b/types/meteor/mongo.d.ts
@@ -124,7 +124,7 @@ declare module Mongo {
     var Collection: CollectionStatic;
     interface CollectionStatic {
         new <T>(name: string, options?: {
-            connection?: Object;
+            connection?: Object | null;
             idGeneration?: string;
             transform?: Function;
         }): Collection<T>;
@@ -348,7 +348,7 @@ declare module "meteor/mongo" {
         var Collection: CollectionStatic;
         interface CollectionStatic {
             new <T>(name: string, options?: {
-                connection?: Object;
+                connection?: Object | null;
                 idGeneration?: string;
                 transform?: Function;
             }): Collection<T>;

From 77ed0db77cb4afba72d442115c9f9122a08e07b7 Mon Sep 17 00:00:00 2001
From: Cain Martin <cmartin@wizcorp.jp>
Date: Thu, 7 Jun 2018 19:57:20 +0900
Subject: [PATCH 042/141] PlayCanvas: audiolistner -> audiolistener

Small typo fix.
---
 types/playcanvas/engine/framework/entity.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/playcanvas/engine/framework/entity.d.ts b/types/playcanvas/engine/framework/entity.d.ts
index 4fd31d0013..e8dbc2dc88 100644
--- a/types/playcanvas/engine/framework/entity.d.ts
+++ b/types/playcanvas/engine/framework/entity.d.ts
@@ -1,5 +1,5 @@
 declare namespace pc {
-    type ComponentTypes = 'animation' | 'audiolistner' | 'camera' | 'collision' |
+    type ComponentTypes = 'animation' | 'audiolistener' | 'camera' | 'collision' |
         'element' | 'light' | 'model' | 'particlesystem' |
         'rigidbody' | 'screen' | 'script' | 'sound' | 'zone';
 
@@ -169,11 +169,11 @@ declare namespace pc {
         *   this.entity.parent.addChild(e); // Add it as a sibling to the original
         */
         clone(): pc.Entity;
-                
+
 
         // Possible attached components
         animation: pc.AnimationComponent;
-        audiolistner: pc.AudioListenerComponent;
+        audiolistener: pc.AudioListenerComponent;
         camera: pc.CameraComponent;
         collision: pc.CollisionComponent;
         element: pc.ElementComponent;
@@ -187,4 +187,4 @@ declare namespace pc {
         zone: pc.ZoneComponent;
 
     }
-}
\ No newline at end of file
+}

From d7e3d7cd973e8297fb0fddc104559af623720041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Ruschka?= <vojtech.ruschka@etnetera.cz>
Date: Thu, 7 Jun 2018 13:03:29 +0200
Subject: [PATCH 043/141] Added definition of reviver function.

---
 types/mathjs/index.d.ts      |  8 ++++++++
 types/mathjs/mathjs-tests.ts | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index cdecc3e1b4..a87939fa56 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -36,6 +36,7 @@ declare namespace math { // tslint:disable-line strict-export-declare-modifiers
 		version: string;
 
 		expression: MathNode;
+		json: MathJsJson;
 
 		config: (options: any) => void;
 
@@ -2249,4 +2250,11 @@ declare namespace math { // tslint:disable-line strict-export-declare-modifiers
 		valueOf(): any;
 		toString(): string;
 	}
+
+	interface MathJsJson {
+		/**
+		 * Returns reviver function that can be used as reviver in JSON.parse function.
+		 */
+		reviver(): (key: any, value: any) => any;
+	}
 }
diff --git a/types/mathjs/mathjs-tests.ts b/types/mathjs/mathjs-tests.ts
index 6cf43dc698..09202e0599 100644
--- a/types/mathjs/mathjs-tests.ts
+++ b/types/mathjs/mathjs-tests.ts
@@ -365,3 +365,15 @@ Expression tree examples
 		}
 	});
 }
+
+/*
+JSON serialization/deserialization
+*/
+{
+	const data = {
+		bigNumber: math.bignumber('1.5')
+	};
+	const stringified = JSON.stringify(data);
+	const parsed = JSON.parse(stringified, math.json.reviver);
+	parsed.bigNumber === math.bignumber('1.5'); // true
+}

From 5ad9dea7bed759e3db12eba07507b7d7307a6989 Mon Sep 17 00:00:00 2001
From: Henrik Raitasola <henrik.raitasola@gmail.com>
Date: Thu, 7 Jun 2018 16:09:45 +0300
Subject: [PATCH 044/141] Add generic for PushedScreen

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

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 3edf071e98..1fd2697b8e 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -85,13 +85,13 @@ export interface ModalScreen extends Screen {
     animationType?: 'slide-up' | 'none';
 }
 
-export interface ResetScreen extends Screen {
-    passProps?: object;
+export interface ResetScreen<P> extends Screen {
+    passProps?: P;
     animated?: boolean;
     animationType?: 'fade' | 'slide-horizontal';
 }
 
-export interface PushedScreen extends ResetScreen {
+export interface PushedScreen<P> extends ResetScreen<P> {
     titleImage?: any;
     backButtonTitle?: string;
     backButtonHidden?: boolean;
@@ -123,10 +123,10 @@ export interface NavigatorEvent {
 }
 
 export class Navigator {
-    push(params: PushedScreen): void;
+    push<P>(params: PushedScreen<P>): void;
     pop(params?: { animated?: boolean; animationType?: 'fade' | 'slide-horizontal'; }): void;
     popToRoot(params?: { animated?: boolean; animationType?: 'fade' | 'slide-horizontal'; }): void;
-    resetTo(params: PushedScreen): void;
+    resetTo<P>(params: PushedScreen<P>): void;
     showModal(params: ModalScreen): void;
     dismissModal(params?: { animationType?: 'none' | 'slide-down' }): void;
     dismissAllModals(params?: { animationType?: 'none' | 'slide-down' }): void;

From 99ff891a7d0535de9f9d816225205261d4aad549 Mon Sep 17 00:00:00 2001
From: Henrik Raitasola <henrik.raitasola@gmail.com>
Date: Thu, 7 Jun 2018 16:14:45 +0300
Subject: [PATCH 045/141] Add test case for generic

---
 .../react-native-navigation-tests.tsx             | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
index e99bfd47dc..cba7175efa 100644
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ b/types/react-native-navigation/react-native-navigation-tests.tsx
@@ -30,7 +30,11 @@ class Screen1 extends React.Component<Props> {
     };
 
     componentDidMount() {
-        this.props.navigator.push({ screen: 'example.Screen2', overrideBackPress: false });
+        this.props.navigator.push<Screen2OwnProps>({
+            screen: 'example.Screen2',
+            overrideBackPress: false,
+            passProps: { name: 'Henrik' },
+        });
         this.props.navigator.setTabBadge({ badge: null });
     }
 
@@ -43,7 +47,13 @@ class Screen1 extends React.Component<Props> {
     }
 }
 
-class Screen2 extends React.Component<NavigationComponentProps> {
+interface Screen2OwnProps {
+    name: string;
+}
+
+type Screen2Props = Screen2OwnProps & NavigationComponentProps;
+
+class Screen2 extends React.Component<Screen2Props> {
     static navigatorStyle: NavigatorStyle = {
         drawUnderNavBar: true,
         navBarTranslucent: true
@@ -57,6 +67,7 @@ class Screen2 extends React.Component<NavigationComponentProps> {
         return (
             <View>
                 <Text>Screen 2</Text>
+                <Text>Hello {this.props.name}</Text>
             </View>
         );
     }

From b969b084d105a730efba55a22d0e68973ce32c5c Mon Sep 17 00:00:00 2001
From: thomas-b <breleur.t@gmail.com>
Date: Thu, 7 Jun 2018 15:19:08 +0200
Subject: [PATCH 046/141] [sequelize] Add the "nested" property to
 IncludeOptions interface

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index c847c073b8..2772eaa905 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -13,6 +13,7 @@
 //                 Florian Oellerich <https://github.com/Raigen>
 //                 Todd Bealmear <https://github.com/todd>
 //                 Nick Schultz <https://github.com/nrschultz>
+//                 Thomas Breleur <https://github.com/thomas-b>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -3270,6 +3271,11 @@ declare namespace sequelize {
         paranoid?: boolean;
 
         all?: boolean | string;
+
+        /**
+         * if true, it will also eager load the relations of the child models, recursively.
+         */
+        nested?: boolean;
     }
 
     /**
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 3d2bbdfe05..c3bd9e63af 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -933,6 +933,7 @@ User.findAll( { include : [{ all : 'HasMany', attributes : ['name'] }] } );
 User.findAll( { include : [{ all : true }, { model : User, attributes : ['id'] }] } );
 User.findAll( { include : [{ all : 'BelongsTo' }] } );
 User.findAll( { include : [{ all : true }] } );
+User.findAll( { include : [{ nested : true }] } );
 User.findAll( { where : { username : 'barfooz' }, raw : true } );
 User.findAll( { where : { name : 'worker' }, include : [{ model : User, as : 'ToDos' }] } );
 User.findAll( { where : { user_id : 1 }, attributes : ['a', 'b'], include : [{ model : User, attributes : ['c'] }] } );

From 21060379217e9a6065afd1895cfdd717646deee3 Mon Sep 17 00:00:00 2001
From: Fabian Te <fabiante@users.noreply.github.com>
Date: Thu, 7 Jun 2018 15:27:02 +0200
Subject: [PATCH 047/141] Added tests for chai.assert.deepStrictEqual

---
 types/chai/chai-tests.ts | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/types/chai/chai-tests.ts b/types/chai/chai-tests.ts
index f19514fe71..2c81c42aeb 100644
--- a/types/chai/chai-tests.ts
+++ b/types/chai/chai-tests.ts
@@ -1361,6 +1361,39 @@ suite('assert', () => {
         assert.notDeepEqual(circularObject, secondCircularObject);
     });
 
+    test('deepStrictEqual', () => {
+        assert.deepStrictEqual({tea: 'chai'}, {tea: 'chai'});
+        assert.throws(() => assert.deepStrictEqual({tea: 'chai'}, {tea: 'black'}));
+
+        const obja = Object.create({tea: 'chai'});
+        const objb = Object.create({tea: 'chai'});
+
+        assert.deepStrictEqual(obja, objb);
+
+        const obj1 = Object.create({tea: 'chai'});
+        const obj2 = Object.create({tea: 'black'});
+
+        assert.throws(() => assert.deepStrictEqual(obj1, obj2));
+    });
+
+    test('deepStrictEqual (ordering)', () => {
+        const a = {a: 'b', c: 'd'};
+        const b = {c: 'd', a: 'b'};
+        assert.deepStrictEqual(a, b);
+    });
+
+    test('deepStrictEqual (circular)', () => {
+        const circularObject: any = {};
+        const secondCircularObject: any = {};
+        circularObject.field = circularObject;
+        secondCircularObject.field = secondCircularObject;
+
+        assert.deepStrictEqual(circularObject, secondCircularObject);
+
+        secondCircularObject.field2 = secondCircularObject;
+        assert.deepStrictEqual(circularObject, secondCircularObject);
+    });
+
     test('isNull', () => {
         assert.isNull(null);
         assert.isNull(undefined);

From ce9e97b02de4a52b6d4fd02a6f29e0d06125f1eb Mon Sep 17 00:00:00 2001
From: Fabian Te <fabiante@users.noreply.github.com>
Date: Thu, 7 Jun 2018 14:44:28 +0200
Subject: [PATCH 048/141] Added deepStrictEqual method to chai.assert

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

diff --git a/types/chai/index.d.ts b/types/chai/index.d.ts
index d0f5ab099c..d260973b71 100644
--- a/types/chai/index.d.ts
+++ b/types/chai/index.d.ts
@@ -353,7 +353,7 @@ declare namespace Chai {
         notStrictEqual<T>(actual: T, expected: T, message?: string): void;
 
         /**
-         * Asserts that actual is deeply equal to expected.
+         * Asserts that actual is deeply equal (==) to expected.
          *
          * @type T   Type of the objects.
          * @param actual   Actual value.
@@ -363,7 +363,7 @@ declare namespace Chai {
         deepEqual<T>(actual: T, expected: T, message?: string): void;
 
         /**
-         * Asserts that actual is not deeply equal to expected.
+         * Asserts that actual is not deeply equal (==) to expected.
          *
          * @type T   Type of the objects.
          * @param actual   Actual value.
@@ -372,6 +372,16 @@ declare namespace Chai {
          */
         notDeepEqual<T>(actual: T, expected: T, message?: string): void;
 
+        /**
+         * Asserts that actual is deeply strict equal (===) to expected.
+         *
+         * @type T   Type of the objects.
+         * @param actual   Actual value.
+         * @param expected   Potential expected value.
+         * @param message   Message to display on error.
+         */
+        deepStrictEqual<T>(actual: T, expected: T, message?: string): void;
+
         /**
          * Asserts valueToCheck is strictly greater than (>) valueToBeAbove.
          *

From d8a31db49c20fa1f84f5e6b60548c6d4a8fe6ac3 Mon Sep 17 00:00:00 2001
From: Filip Stanis <fstanis@google.com>
Date: Thu, 7 Jun 2018 14:58:59 +0100
Subject: [PATCH 049/141] Add none() to multer.Instance

none() was added in PR [#372](https://github.com/expressjs/multer/pull/372)
---
 types/multer/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/multer/index.d.ts b/types/multer/index.d.ts
index d019b9fdcb..7d2bfefc26 100644
--- a/types/multer/index.d.ts
+++ b/types/multer/index.d.ts
@@ -71,6 +71,8 @@ declare namespace multer {
         fields(fields: Field[]): express.RequestHandler;
         /** Accepts all files that comes over the wire. An array of files will be stored in req.files. */
         any(): express.RequestHandler;
+        /** Accept only text fields. If any file upload is made, error with code “LIMIT_UNEXPECTED_FILE” will be issued. This is the same as doing upload.fields([]). */
+        none(): express.RequestHandler;
     }
 }
 

From 71b2a290c430db5b58e2eba7748060301a1b6edf Mon Sep 17 00:00:00 2001
From: Drew Schneider <drewgolas@users.noreply.github.com>
Date: Thu, 7 Jun 2018 13:25:16 -0400
Subject: [PATCH 050/141] Add showTimeSelectOnly to the typing

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

diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index 368894c0ed..c56f2dd37e 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -6,6 +6,7 @@
 //                 Platon Pronko <https://github.com/Rogach>
 //                 Roy Xue <https://github.com/royxue>
 // 				   Koala Human <https://github.com/KoalaHuman>
+//				   Drew Schneider <https://github.com/drewgolas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -88,6 +89,7 @@ export interface ReactDatePickerProps {
 	yearDropdownItemNumber?: number;
 	shouldCloseOnSelect?: boolean;
 	showTimeSelect?: boolean;
+	showTimeSelectOnly?: boolean;
 	timeFormat?: string;
 	timeIntervals?: number;
 	minTime?: moment.Moment;

From f2b7cc0062285b89220f6eebaa694d5ed59f29f2 Mon Sep 17 00:00:00 2001
From: Drew Schneider <drewgolas@users.noreply.github.com>
Date: Thu, 7 Jun 2018 13:38:27 -0400
Subject: [PATCH 051/141] Removed self from receiving notifications

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

diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index c56f2dd37e..f8a78315b3 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -6,7 +6,6 @@
 //                 Platon Pronko <https://github.com/Rogach>
 //                 Roy Xue <https://github.com/royxue>
 // 				   Koala Human <https://github.com/KoalaHuman>
-//				   Drew Schneider <https://github.com/drewgolas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 04277b589c23e5bb0827cdeefbcd68ed2b707b9b Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 21:21:03 +0200
Subject: [PATCH 052/141] Fix TransformStream type parameters

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index accc08276c..82672a7a12 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -148,9 +148,9 @@ declare class CountQueuingStrategy {
 }
 
 declare interface TransformStreamTransformer<R, W> {
-  start?(controller: TransformStreamDefaultController<W>): void | Promise<void>;
-  transform?(chunk: R, controller: TransformStreamDefaultController<W>): void | Promise<void>;
-  flush?(controller: TransformStreamDefaultController<W>): void | Promise<void>;
+  start?(controller: TransformStreamDefaultController<R>): void | Promise<void>;
+  transform?(chunk: W, controller: TransformStreamDefaultController<R>): void | Promise<void>;
+  flush?(controller: TransformStreamDefaultController<R>): void | Promise<void>;
 }
 
 declare class TransformStream<R, W> implements WritableReadablePair<WritableStream<W>, ReadableStream<R>> {
@@ -160,8 +160,8 @@ declare class TransformStream<R, W> implements WritableReadablePair<WritableStre
   readonly writable: WritableStream<W>;
 }
 
-declare class TransformStreamDefaultController<W> {
-  enqueue(chunk: W): void;
+declare class TransformStreamDefaultController<R> {
+  enqueue(chunk: R): void;
   error(reason: any): void;
   terminate(): void;
 

From da7058e16c965e56b927a3fd2aee919e2315dc4a Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 21:26:05 +0200
Subject: [PATCH 053/141] Add usage example for LipFuzzTransformer

---
 types/whatwg-streams/whatwg-streams-tests.ts | 35 +++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/types/whatwg-streams/whatwg-streams-tests.ts b/types/whatwg-streams/whatwg-streams-tests.ts
index 141f47c820..0bb1068f31 100644
--- a/types/whatwg-streams/whatwg-streams-tests.ts
+++ b/types/whatwg-streams/whatwg-streams-tests.ts
@@ -362,8 +362,19 @@ class WebSocketSink implements WritableStreamSink {
 
 type Dictionary<T> = { [key: string]: T }
 
+declare function fetch(input?: Request | string): Promise<Response>;
 declare interface FetchEvent {
-    respondWith(promise: Promise<any>): void;
+    readonly request: Request;
+    respondWith(promise: Promise<Response>): void;
+}
+declare class Request {
+    readonly url: string;
+}
+declare class Response {
+    constructor(body?: ReadableStream<any>);
+    readonly body: ReadableStream<ArrayBufferView>;
+}
+declare class TextDecoderStream extends TransformStream<string, ArrayBufferView> {
 }
 
 class LipFuzzTransformer implements TransformStreamTransformer<string, string> {
@@ -411,3 +422,25 @@ class LipFuzzTransformer implements TransformStreamTransformer<string, string> {
         return replacement;
     }
 }
+
+{
+    const userName = "";
+    const displayName = "";
+    const icon = "";
+    const date = "";
+    const fetchEvent = {} as FetchEvent;
+
+    const data = { userName, displayName, icon, date };
+    const ts = new TransformStream(new LipFuzzTransformer(data));
+
+    fetchEvent.respondWith(
+        fetch(fetchEvent.request.url).then(response => {
+            const transformedBody = response.body
+                // Decode the binary-encoded response to string
+                .pipeThrough(new TextDecoderStream())
+                // Apply the LipFuzzTransformer
+                .pipeThrough(ts);
+            return new Response(transformedBody);
+        })
+    );
+}

From 01793f2d1f4e2099eaec0b736ff93e904513f21f Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 21:28:32 +0200
Subject: [PATCH 054/141] Add sync mapper example

---
 types/whatwg-streams/whatwg-streams-tests.ts | 35 ++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/types/whatwg-streams/whatwg-streams-tests.ts b/types/whatwg-streams/whatwg-streams-tests.ts
index 0bb1068f31..c7ed11928b 100644
--- a/types/whatwg-streams/whatwg-streams-tests.ts
+++ b/types/whatwg-streams/whatwg-streams-tests.ts
@@ -444,3 +444,38 @@ class LipFuzzTransformer implements TransformStreamTransformer<string, string> {
         })
     );
 }
+
+
+// 8.10. A transform stream created from a sync mapper function
+
+function mapperTransformStream<R, W>(mapperFunction: (chunk: W) => R) {
+    return new TransformStream<R, W>({
+        transform(chunk, controller) {
+            controller.enqueue(mapperFunction(chunk));
+        }
+    });
+}
+
+{
+    const ts = mapperTransformStream((chunk: string) => chunk.toUpperCase());
+    const writer = ts.writable.getWriter();
+    const reader = ts.readable.getReader();
+
+    writer.write("No need to shout");
+
+    // Logs "NO NEED TO SHOUT":
+    reader.read().then(({ value }) => console.log(value));
+
+}
+
+{
+    const ts = mapperTransformStream((chunk: string) => JSON.parse(chunk));
+    const writer = ts.writable.getWriter();
+    const reader = ts.readable.getReader();
+
+    writer.write("[1, ");
+
+    // Logs a SyntaxError, twice:
+    reader.read().catch(e => console.error(e));
+    writer.write("{}").catch(e => console.error(e));
+}

From 7a880ed60f1fb7c0cb4c234c8d33bd406902b6d6 Mon Sep 17 00:00:00 2001
From: Ben Phillips <ben@ripl.com>
Date: Thu, 7 Jun 2018 14:07:18 -0700
Subject: [PATCH 055/141] Add in event for onClick method

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

diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 1c81ffc3c8..8f3ed58adf 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -21,7 +21,7 @@ interface ReactFacebookLoginProps {
     icon?: string | React.ReactNode;
     isDisabled?: boolean;
     language?: string;
-    onClick?(): void;
+    onClick?(event: React.MouseEvent<HTMLDivElement>): void;
     reAuthenticate?: boolean;
     redirectUri?: string;
     scope?: string;

From 65f4f4e162319652c695d36e280258511fdf6710 Mon Sep 17 00:00:00 2001
From: Ben Phillips <ben@ripl.com>
Date: Thu, 7 Jun 2018 14:08:03 -0700
Subject: [PATCH 056/141] Add in accessToken and a few other fields like name
 and email that could be provided.

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

diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 8f3ed58adf..2cd75419b2 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -40,7 +40,9 @@ export interface ReactFacebookFailureResponse {
 
 export interface ReactFacebookLoginInfo {
     id: string;
-    name: string;
+    accessToken: string;
+    name?: string;
+    email?: string;
 }
 
 interface ReactFacebookLoginState {

From 150e0345a3ce4366ee66bbb68a9285fb480f7362 Mon Sep 17 00:00:00 2001
From: Henrik Raitasola <henrik.raitasola@gmail.com>
Date: Fri, 8 Jun 2018 10:46:13 +0300
Subject: [PATCH 057/141] Disable rule that doesn't make sense

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

diff --git a/types/react-native-navigation/tslint.json b/types/react-native-navigation/tslint.json
index 3db14f85ea..486c3a94ef 100644
--- a/types/react-native-navigation/tslint.json
+++ b/types/react-native-navigation/tslint.json
@@ -1 +1 @@
-{ "extends": "dtslint/dt.json" }
+{ "extends": "dtslint/dt.json", "rules": {"no-unnecessary-generics": false} }

From 6f9e603688e408adbe890f654548ea11aeed797e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Rudge?= <luis@luisrudge.net>
Date: Fri, 8 Jun 2018 05:37:23 -0300
Subject: [PATCH 058/141] add `languageDictionary` to Auth0LockShowOptions

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

diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 27639834db..7dc20ae176 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -161,6 +161,7 @@ interface Auth0LockShowOptions {
     initialScreen?: "login" | "signUp" | "forgotPassword";
     flashMessage?: Auth0LockFlashMessageOptions;
     rememberLastLogin?: boolean;
+    languageDictionary?: any;
 }
 
 interface AuthResult {

From dafdf97b5f9e1fd7a053ee27ef22312227a3af0a Mon Sep 17 00:00:00 2001
From: Luis Deschamps Rudge <luis@luisrudge.net>
Date: Fri, 8 Jun 2018 05:48:16 -0300
Subject: [PATCH 059/141] add tests

---
 types/auth0-lock/auth0-lock-tests.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/auth0-lock/auth0-lock-tests.ts b/types/auth0-lock/auth0-lock-tests.ts
index 0c64fd361b..fc070f62df 100644
--- a/types/auth0-lock/auth0-lock-tests.ts
+++ b/types/auth0-lock/auth0-lock-tests.ts
@@ -39,7 +39,10 @@ const showOptions : Auth0LockShowOptions = {
     type: "error",
     text: "an error has occurred"
   },
-  rememberLastLogin: false
+  rememberLastLogin: false,
+  languageDictionary: {
+    title: "test"
+  }
 };
 
 lock.show(showOptions);

From 03507a3fe6359e53f28d55eb55f0e574a47a25a0 Mon Sep 17 00:00:00 2001
From: Sander Koenders <sanderkoenders@gmail.com>
Date: Fri, 8 Jun 2018 13:00:08 +0200
Subject: [PATCH 060/141] Feat(Node 4): Add ProcessEnv interface

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

diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index dab3b0c5d9..501ed87d44 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -407,6 +407,10 @@ declare namespace NodeJS {
         isTTY?: true;
     }
 
+    export interface ProcessEnv {
+        [key: string]: string | undefined;
+    }
+
     export interface Process extends EventEmitter {
         stdout: Socket;
         stderr: Socket;
@@ -418,7 +422,7 @@ declare namespace NodeJS {
         chdir(directory: string): void;
         cwd(): string;
         debugPort: number;
-        env: any;
+        env: ProcessEnv;
         exit(code?: number): void;
         exitCode: number;
         getgid(): number;

From bb8dec6a26cd41092032bb609f88dfeba2754711 Mon Sep 17 00:00:00 2001
From: Sander Koenders <sanderkoenders@gmail.com>
Date: Fri, 8 Jun 2018 13:00:25 +0200
Subject: [PATCH 061/141] Feat(Node 6): Add ProcessEnv interface

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

diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 570e668c53..5f47b55f3f 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -460,6 +460,10 @@ declare namespace NodeJS {
         isTTY?: true;
     }
 
+    export interface ProcessEnv {
+        [key: string]: string | undefined;
+    }
+
     export interface WriteStream extends Socket {
         columns?: number;
         rows?: number;

From f8ff96599af4a3ba067e17ea3b30e7975a94ea80 Mon Sep 17 00:00:00 2001
From: Sander Koenders <sanderkoenders@gmail.com>
Date: Fri, 8 Jun 2018 13:00:51 +0200
Subject: [PATCH 062/141] Feat(Node 7): Add ProcessEnv interface

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

diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 055933977d..e5a7d1059c 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -456,6 +456,10 @@ declare namespace NodeJS {
         isTTY?: true;
     }
 
+    export interface ProcessEnv {
+        [key: string]: string | undefined;
+    }
+
     export interface WriteStream extends Socket {
         columns?: number;
         rows?: number;
@@ -479,7 +483,7 @@ declare namespace NodeJS {
         cwd(): string;
         debugPort: number;
         emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
-        env: any;
+        env: ProcessEnv;
         exit(code?: number): never;
         exitCode: number;
         getgid(): number;

From bc22dd04a076962450341c2bc383ca029544c6ed Mon Sep 17 00:00:00 2001
From: Sander Koenders <sanderkoenders@gmail.com>
Date: Fri, 8 Jun 2018 13:47:46 +0200
Subject: [PATCH 063/141] Test(Node 4): Alter test for ProcessEnv

---
 types/node/v4/node-tests.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index 6409e83e18..8de12003cf 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -734,19 +734,7 @@ namespace path_tests {
     // returns
     //        ['foo', 'bar', 'baz']
 
-    console.log(process.env.PATH)
-    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
-
-    process.env.PATH.split(path.delimiter)
-    // returns
-    //        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
-
-    console.log(process.env.PATH)
-    // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
-
-    process.env.PATH.split(path.delimiter)
-    // returns
-    //        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
+    process.env["PATH"]; // $ExpectType string
 
     path.parse('/home/user/dir/file.txt')
     // returns

From c9bcd193cb673eef49dcb59213e2fc5a86e272d2 Mon Sep 17 00:00:00 2001
From: Sander Koenders <sanderkoenders@gmail.com>
Date: Fri, 8 Jun 2018 13:48:10 +0200
Subject: [PATCH 064/141] Test(Node 6): Alter test for ProcessEnv

---
 types/node/v6/node-tests.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 4457f83492..789fc5c744 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -1364,19 +1364,7 @@ namespace path_tests {
     // returns
     //        ['foo', 'bar', 'baz']
 
-    console.log(process.env.PATH)
-    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
-
-    process.env.PATH.split(path.delimiter)
-    // returns
-    //        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
-
-    console.log(process.env.PATH)
-    // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
-
-    process.env.PATH.split(path.delimiter)
-    // returns
-    //        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
+    process.env["PATH"]; // $ExpectType string
 
     path.parse('/home/user/dir/file.txt')
     // returns

From 23bf075ab3a47f1c661e1447177f01dfd8c62384 Mon Sep 17 00:00:00 2001
From: Sander Koenders <sanderkoenders@gmail.com>
Date: Fri, 8 Jun 2018 13:48:24 +0200
Subject: [PATCH 065/141] Test(Node 7): Alter test for ProcessEnv

---
 types/node/v7/node-tests.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index 0ea05066b4..8d6f0af1e3 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -1346,19 +1346,7 @@ namespace path_tests {
     // returns
     //        ['foo', 'bar', 'baz']
 
-    console.log(process.env.PATH)
-    // '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin'
-
-    process.env.PATH.split(path.delimiter)
-    // returns
-    //        ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin']
-
-    console.log(process.env.PATH)
-    // 'C:\Windows\system32;C:\Windows;C:\Program Files\nodejs\'
-
-    process.env.PATH.split(path.delimiter)
-    // returns
-    //        ['C:\Windows\system32', 'C:\Windows', 'C:\Program Files\nodejs\']
+    process.env["PATH"]; // $ExpectType string
 
     path.parse('/home/user/dir/file.txt')
     // returns

From 8b140f037c2058aab2ce232a63d4395f386d8e2f Mon Sep 17 00:00:00 2001
From: Sander Koenders <sanderkoenders@gmail.com>
Date: Fri, 8 Jun 2018 13:54:51 +0200
Subject: [PATCH 066/141] Docs(name): Add my name to contributors list

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

diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 501ed87d44..cd771ff805 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Sander Koenders <https://github.com/Archcry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 5f47b55f3f..c8470c7f76 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -7,6 +7,7 @@
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Alorel <https://github.com/Alorel>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
+//                 Sander Koenders <https://github.com/Archcry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index e5a7d1059c..18442291a1 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -7,6 +7,7 @@
 //                 Wilco Bakker <https://github.com/WilcoBakker>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
+//                 Sander Koenders <https://github.com/Archcry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************

From f4ee3156b31327cd339dd4d08a135b4d1d2a4b10 Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <gh@dawnmist.net>
Date: Fri, 8 Jun 2018 22:03:03 +1000
Subject: [PATCH 067/141] Add missing fields required for custom header use in
 v2.x.

See https://github.com/react-navigation/react-navigation/issues/4286
---
 types/react-navigation/index.d.ts             |  2 ++
 .../react-navigation-tests.tsx                | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index dd9efa0de4..381f2320dd 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -607,6 +607,7 @@ export interface NavigationScene {
   isStale: boolean;
   key: string;
   route: NavigationRoute;
+  descriptor: NavigationDescriptor;
 }
 
 export interface NavigationTransitionProps {
@@ -1058,6 +1059,7 @@ export interface NavigationDescriptor<Params = NavigationParams> {
   key: string;
   state: NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
   navigation: NavigationScreenProp<any>;
+  options: NavigationScreenOptions;
   getComponent: () => React.ComponentType;
 }
 
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 9697e61de8..7563708163 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import {
+    Text,
     TouchableOpacity,
     View,
     ViewStyle,
@@ -469,3 +470,22 @@ const BottomStack = createBottomTabNavigator({
         }
     }
 });
+
+const CustomHeaderStack = createStackNavigator({
+    Page1: { screen: Page1 },
+    Page2: { screen: Page2 }
+},
+{
+    navigationOptions: {
+        header: headerProps => {
+            const { scene } = headerProps;
+            const { options } = scene.descriptor;
+            const { title, headerStyle, headerTitleStyle } = options;
+            return (
+                <View style={headerStyle}>
+                    <Text style={headerTitleStyle}>{title}</Text>
+                </View>
+            );
+        }
+    }
+});

From 09ff4cfc0a0677e498f537640dfefa7fb40fbba1 Mon Sep 17 00:00:00 2001
From: Sander Koenders <sanderkoenders@gmail.com>
Date: Fri, 8 Jun 2018 14:09:33 +0200
Subject: [PATCH 068/141] Fix(node 6): Use ProcessEnv in Process interface

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

diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index c8470c7f76..baf0776dcf 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -487,7 +487,7 @@ declare namespace NodeJS {
         cwd(): string;
         debugPort: number;
         emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
-        env: any;
+        env: ProcessEnv;
         exit(code?: number): void;
         exitCode: number;
         getgid(): number;

From abeaf1be7fbfa30c94bc6fc94b388d25ef26b94e Mon Sep 17 00:00:00 2001
From: Simon Podlipsky <simon@podlipsky.net>
Date: Fri, 8 Jun 2018 16:58:30 +0200
Subject: [PATCH 069/141] Add Bounds field to Chart.js CommonAxe

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

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index cb3db72855..8063cf2629 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -506,6 +506,7 @@ declare namespace Chart {
     }
 
     interface CommonAxe {
+        bounds?: string;
         type?: ScaleType | string;
         display?: boolean;
         id?: string;

From 4c68635f4d5530c267f2c9b2e166e94d9ac4a314 Mon Sep 17 00:00:00 2001
From: Arthur Carre <arthur.carre@oracle.com>
Date: Fri, 8 Jun 2018 10:51:12 -0700
Subject: [PATCH 070/141] Adding additional bodyPadding to IFrameOptions This
 change add the missing bodyPadding to the IFrameOptions definition of
 iframe-resizer

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

diff --git a/types/iframe-resizer/index.d.ts b/types/iframe-resizer/index.d.ts
index 3858cab780..6e67a5b592 100644
--- a/types/iframe-resizer/index.d.ts
+++ b/types/iframe-resizer/index.d.ts
@@ -32,6 +32,11 @@ export interface IFrameOptions {
    * CSS margin attribute, for example '8px 3em'. A number value is converted into px.
    */
   bodyMargin?: number | string;
+  /**
+   * Override the default body padding style in the iFrame. A string can be any valid value for the
+   * CSS margin attribute, for example '8px 3em'. A number value is converted into px.
+   */
+  bodyPadding?: number | string;
   /**
    * When set to true, only allow incoming messages from the domain listed in the src property of the iFrame tag.
    * If your iFrame navigates between different domains, ports or protocols; then you will need to

From 4ef4d09eb0dd269b9db915924725bcb8ad10573d Mon Sep 17 00:00:00 2001
From: Saman Amraii <nebeleh@gmail.com>
Date: Fri, 8 Jun 2018 19:37:13 -0700
Subject: [PATCH 071/141] update to three-core.d.ts

BufferAttributes require a 3rd optional normalized arg of type boolean.
---
 types/three/three-core.d.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 3ad1568409..4b80f3bc47 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -775,39 +775,39 @@ export class Float64Attribute extends BufferAttribute {
 }
 
 export class Int8BufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 export class Uint8BufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 export class Uint8ClampedBufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 export class Int16BufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 export class Uint16BufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 export class Int32BufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 export class Uint32BufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 export class Float32BufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 export class Float64BufferAttribute extends BufferAttribute {
-    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number);
+    constructor(array: Iterable<number> | ArrayLike<number> | ArrayBuffer, itemSize: number, normalized?: boolean);
 }
 
 /**

From 217d2bf4be2e09e5d7eb218cd6bbadb78bd3f0e3 Mon Sep 17 00:00:00 2001
From: Cerberuser <computers05@mail.ru>
Date: Fri, 8 Jun 2018 09:35:54 +0700
Subject: [PATCH 072/141] Cytoscape: tested large amount of cases; heavily
 refactored general types; added some methods; added chaining possibility in
 some places

---
 types/cytoscape/cytoscape-tests.ts | 381 ++++++++++++++++++++-
 types/cytoscape/index.d.ts         | 520 +++++++++++++++++++++--------
 2 files changed, 763 insertions(+), 138 deletions(-)

diff --git a/types/cytoscape/cytoscape-tests.ts b/types/cytoscape/cytoscape-tests.ts
index 71e815208c..39be1cd0e7 100644
--- a/types/cytoscape/cytoscape-tests.ts
+++ b/types/cytoscape/cytoscape-tests.ts
@@ -1,6 +1,26 @@
 'use strict';
-import cytoscape = require('cytoscape');
 
+// TODO: document all aliases as aliases, not as duplicates!
+
+const assert = (tag: boolean) => { if (!tag) throw new Error(); };
+const aliases = (...obj: Array<{}>) => { if (obj.slice(1).some((alias) => alias !== obj[0])) throw new Error(); };
+const events = (obj: any) => {
+  aliases(obj.on, obj.bind, obj.listen, obj.addListener);
+  aliases(obj.promiseOn, obj.pon);
+  aliases(obj.off, obj.unbind, obj.unlisten, obj.removeListener);
+  aliases(obj.emit, obj.trigger);
+};
+
+// definitions
+function oneOf<A, B, C, D, E>(a: A, b: B, c: C, d: D, e: E): A | B | C | D | E;
+function oneOf<A, B, C, D>(a: A, b: B, c: C, d: D): A | B | C | D;
+function oneOf<A, B, C>(a: A, b: B, c: C): A | B | C;
+function oneOf<A, B>(a: A, b: B): A | B;
+function oneOf<T>(...array: T[]): T {
+  return array[0];
+}
+
+import cytoscape = require('cytoscape');
 const parentCSS = {
   'padding-top': '10px',
   'padding-left': '10px',
@@ -68,7 +88,7 @@ const cy = cytoscape({
       { data: { id: 'eb', source: 'e', target: 'b' } }
     ]
   },
-  
+
   // initial viewport state:
   zoom: 1,
   pan: { x: 0, y: 0 },
@@ -96,7 +116,7 @@ const cy = cytoscape({
   motionBlurOpacity: 0.2,
   wheelSensitivity: 1,
   pixelRatio: 'auto',
-    
+
   layout: {
     name: 'preset',
     padding: 5
@@ -108,6 +128,42 @@ cy.on('zoom', (event) => {
     cy.nodes('$node > node').style('opacity', 0);
   }
 });
+cy.off('zoom');
+events(cy);
+
+cy.add({ data: { id: 'g' }, position: {x: 200, y: 150} });
+cy.add([
+  { data: { id: 'h' }, position: {x: 250, y: 100} }
+]);
+const nodesBeforeDelete = cy.nodes();
+const edgesBeforeDelete = cy.edges();
+
+const removed = cy.remove('#g #h');
+cy.add(removed);
+const diffNodes = nodesBeforeDelete.diff(cy.nodes());
+const diffEdges = edgesBeforeDelete.diff(cy.edges());
+assert(diffNodes.left.size() === 0 && diffNodes.right.size() === 0 && diffNodes.both.size() === cy.nodes().size());
+assert(nodesBeforeDelete.same(cy.nodes()));
+assert(edgesBeforeDelete.same(cy.edges()));
+
+const gh = cy.collection().add(cy.$id('g')).union(cy.getElementById('h'));
+const gh2 = cy.$('#g #h');
+const gh3 = cy.nodes('#g #h');
+assert(gh2.same(gh));
+assert(gh3.same(gh));
+assert(gh.same(removed));
+
+assert(cy.container() === null); // headless mode!
+
+cy.center();
+cy.center(gh);
+aliases(cy.center, cy.centre);
+
+cy.fit(cy.$('#a #b #h'));
+
+const {x1, y1, x2, y2, w, h} = cy.extent();
+
+aliases(cy.resize, cy.invalidateDimensions);
 
 cy.animate({
   fit: {
@@ -117,8 +173,323 @@ cy.animate({
   duration: 500
 });
 
-const node = cy.nodes()[0];
 cy.animate({
-  center: {eles: node},
+  center: {eles: cy.nodes()[0]},
   duration: 500
 });
+
+const anim = cy.animation({
+  zoom: {
+    level: 1,
+    position: {x: 0, y: 0}
+  },
+  pan: {x: 100, y: 100},
+  duration: 100,
+  easing: 'ease'
+});
+cy.stop(true, true);
+anim.play();
+assert(anim.playing());
+anim.progress(anim.progress() + 50);
+anim.time(anim.time() - 50);
+anim.stop();
+
+aliases(cy.layout, cy.createLayout, cy.makeLayout);
+
+// Preconfigured data for layouts (as it could be passed)
+const boundingBox = oneOf({x1: 0, x2: 100, y1: 0, y2: 100}, {x1: 0, w: 100, y1: 0, h: 100});
+const positions = oneOf({a: {x: 100, y: 100}}, (node: cytoscape.NodeCollection): cytoscape.Position => ({x: 100, y: 100}));
+
+// TODO: uncomment after we have the way to add layout options properties from extensions
+// const layouts = [
+//   cy.layout({
+//     name: 'null',
+//     ready: () => {},
+//     stop: () => {}
+//   }),
+//   cy.layout({
+//     name: 'random',
+//     fit: true,
+//     padding: 30,
+//     boundingBox,
+//     animate: false,
+//     animationDuration: 500,
+//     animationEasing: 'ease-in',
+//     animateFilter: (node, i) => true,
+//     transform: (node, position) => position
+//   }),
+//   cy.layout({
+//     name: 'preset',
+//     positions,
+//     zoom: 1,
+//     pan: {x: 100, y: 100},
+//     fit: false,
+//     padding: 30,
+//     animate: false,
+//     animationDuration: 500,
+//     animationEasing: 'ease-out',
+//     animateFilter: (node, i) => true,
+//     transform: (node, position) => position
+//   }),
+//   cy.layout({
+//     name: 'grid',
+//     fit: true,
+//     padding: 30,
+//     boundingBox,
+//     avoidOverlap: true,
+//     avoidOverlapPadding: 10,
+//     nodeDimensionsIncludeLabels: false,
+//     spacingFactor: oneOf(1, undefined),
+//     condense: false,
+//     rows: oneOf(10, undefined),
+//     cols: oneOf(10, undefined),
+//     position: (node) => ({ row: 1, col: 1 }),
+//     sort: (a, b) => 1,
+//     animate: false,
+//     animationDuration: 500,
+//     animationEasing: 'ease-in-out',
+//     animateFilter: (node, i) => true,
+//     transform: (node, position) => position
+//   }),
+//   cy.layout({
+//     name: 'circle',
+//     fit: true,
+//     padding: 30,
+//     boundingBox,
+//     avoidOverlap: true,
+//     nodeDimensionsIncludeLabels: false,
+//     spacingFactor: oneOf(1, undefined),
+//     radius: oneOf(1, undefined),
+//     startAngle: 3 / 2 * Math.PI,
+//     sweep: oneOf(6, undefined),
+//     clockwise: true,
+//     sort: (a, b) => 1,
+//     animate: false,
+//     animationDuration: 500,
+//     animationEasing: 'ease-in-sine',
+//     animateFilter: (node, i) => true,
+//     transform: (node, position) => position
+//   }),
+//   cy.layout({
+//     name: 'concentric',
+//     fit: true,
+//     padding: 30,
+//     startAngle: 3 / 2 * Math.PI,
+//     sweep: oneOf(6, undefined),
+//     clockwise: true,
+//     equidistant: false,
+//     minNodeSpacing: 10,
+//     boundingBox,
+//     avoidOverlap: true,
+//     nodeDimensionsIncludeLabels: false,
+//     height: oneOf(500, undefined),
+//     width: oneOf(500, undefined),
+//     spacingFactor: oneOf(1, undefined),
+//     concentric: (node) => 1,
+//     levelWidth: (nodes) => 1,
+//     animate: false,
+//     animationDuration: 500,
+//     animationEasing: 'ease-out-sine',
+//     animateFilter: (node, i) => true,
+//     transform: (node, position) => position
+//   }),
+//   cy.layout({
+//     name: 'breadthfirst',
+//     fit: true,
+//     directed: false,
+//     padding: 30,
+//     circle: false,
+//     spacingFactor: 1.75,
+//     boundingBox,
+//     avoidOverlap: true,
+//     nodeDimensionsIncludeLabels: false,
+//     maximalAdjustments: 0,
+//     animate: false,
+//     animationDuration: 500,
+//     animationEasing: 'ease-in-out-sine',
+//     animateFilter: (node, i) => true,
+//     transform: (node, position) => position
+//   }),
+//   cy.layout({
+//     name: 'cose',
+//     ready: () => {},
+//     stop: () => {},
+//     animate: oneOf(true, false, 'end'),
+//     animationEasing: oneOf('ease-in-quad', undefined),
+//     animationDuration: oneOf(500, undefined),
+//     animateFilter: function ( node, i ){ return true; },
+//     animationThreshold: 250,
+//     refresh: 20,
+//     fit: true,
+//     padding: 30,
+//     boundingBox: undefined,
+//     nodeDimensionsIncludeLabels: false,
+//     randomize: false,
+//     componentSpacing: 40,
+//     nodeRepulsion: (node) => 2048,
+//     nodeOverlap: 4,
+//     idealEdgeLength: (edge) => 32,
+//     edgeElasticity: (edge) => 32,
+//     nestingFactor: 1.2,
+//     gravity: 1,
+//     numIter: 1000,
+//     initialTemp: 1000,
+//     coolingFactor: 0.99,
+//     minTemp: 1.0,
+//     weaver: false
+//   })
+// ];
+// const lay = layouts[0];
+// aliases(lay.run, lay.start);
+// events(lay);
+// layouts.map(layout => {
+//   layout.run();
+//   layout.stop();
+// });
+
+// TODO: cy.style
+
+cy.png({
+  output: oneOf('base64uri', 'base64', 'blob', undefined),
+  bg: oneOf('#ffffff', undefined),
+  full: true,
+  scale: 2,
+  maxWidth: 100,
+  maxHeight: 100
+});
+aliases(cy.jpg, cy.jpeg);
+cy.jpg({
+  output: oneOf('base64uri', 'base64', 'blob', undefined),
+  bg: oneOf('#ffffff', undefined),
+  full: true,
+  scale: 2,
+  maxWidth: 100,
+  maxHeight: 100,
+  quality: 0.5
+});
+cy.json(cy.json());
+
+// Types possible to call methods
+const ele = oneOf(cy.nodes()[0], cy.edges()[0]);
+const eles = cy.elements();
+const node = cy.nodes()[0];
+const nodes = cy.nodes();
+const edge = cy.edges()[0];
+const edges = cy.edges();
+
+assert(ele.cy() === cy);
+eles.remove();
+assert(eles.removed());
+assert(!eles.inside());
+eles.restore();
+
+([ele, eles, node, nodes, edge, edges] as cytoscape.CollectionReturnValue[]).forEach((elem) => {
+  aliases(elem.clone, elem.copy);
+  events(elem);
+  aliases(elem.data, elem.attr);
+  aliases(elem.removeData, elem.removeAttr);
+});
+// TODO: tests for data flow
+
+const loops = oneOf(true, false);
+node.degree(loops); node.indegree(loops); node.outdegree(loops);
+nodes.totalDegree(loops); nodes.minDegree(loops); nodes.maxDegree(loops);
+nodes.minIndegree(loops); nodes.maxIndegree(loops); nodes.minOutdegree(loops); nodes.maxOutdegree(loops);
+
+// tslint:disable-next-line:ban-types
+const getsetPos = <T extends Function>(func: T): T => {
+  func('x', func('x'));
+  func(func());
+  func({x: 100, y: 100});
+  return func;
+};
+
+aliases(node.modelPosition, node.point, node.position);
+getsetPos(node.position);
+
+nodes.shift('x', 100);
+nodes.shift({x: -100, y: 0});
+
+aliases(nodes.modelPositions, nodes.positions, nodes.points);
+nodes.positions((node, i) => Object.assign(node.position(), {x: node.position('x') + i}));
+
+aliases(node.renderedPosition, node.renderedPoint);
+getsetPos(node.renderedPoint);
+
+// TODO: tests for compound nodes (relativePosition, in particular)
+
+const sizes: number[] = [
+  ele.width(), ele.outerWidth(), ele.renderedWidth(), ele.renderedOuterWidth(),
+  ele.height(), ele.outerHeight(), ele.renderedHeight(), ele.renderedOuterHeight()
+];
+
+aliases(eles.boundingBox, eles.boundingbox);
+aliases(eles.renderedBoundingBox, eles.renderedBoundingbox);
+
+const flags: boolean[] = [
+  node.grabbed(), node.grabbable(), node.locked(), ele.active(),
+];
+
+const edgePoints: cytoscape.Position[] = [
+  ...edge.controlPoints(), ...edge.segmentPoints(), edge.sourceEndpoint(), edge.targetEndpoint(), edge.midpoint()
+];
+
+aliases(eles.layout, eles.createLayout, eles.makeLayout);
+const layout = eles.layout({name: 'random'}).run();
+
+eles.select();
+assert(ele.selected()); // as we selected all, and this too
+aliases(eles.unselect, eles.deselect);
+eles.selectify();
+assert(ele.selectable());
+eles.unselectify();
+
+eles.addClass('test');
+eles.toggleClass('test', oneOf(true, false, undefined));
+eles.removeClass('test');
+eles.classes(oneOf('test', undefined));
+eles.flashClass('test flash', oneOf(1000, undefined));
+assert(ele.hasClass('test'));
+
+eles.style('background-color', 'green');
+Object.keys(eles.style()).map(key => eles.style(key));
+eles.style(eles.style());
+aliases(eles.style, eles.css);
+aliases(ele.renderedCss, ele.renderedStyle);
+
+eles.anySame(nodes);
+aliases(eles.contains, eles.has);
+aliases(eles.allAreNeighbors, eles.allAreNeighbours);
+eles.is('#g');
+eles.allAre('#g');
+eles.some((el, i, els) => true);
+eles.every((el, i, els) => true);
+
+aliases(eles.forEach, eles.each);
+const selected: cytoscape.SingularElementArgument[] = [eles.eq(0), eles.first(), eles.last()];
+const collSel = cy.collection(selected);
+const selectedNodes: cytoscape.NodeSingular[] = [nodes.eq(0), nodes.first(), nodes.last()];
+const collNodes = cy.collection(selectedNodes);
+const selectedEdges: cytoscape.EdgeSingular[] = [edges.eq(0), edges.first(), edges.last()];
+eles.slice(0, -1);
+eles.toArray();
+
+aliases(eles.getElementById, eles.$id);
+aliases(eles.union, eles.add, eles.or, eles.u, eles['+'], eles['|']);
+aliases(eles.difference, eles.not, eles.subtract, eles.relativeComplement, eles['\\'], eles['!'], eles['-']);
+aliases(eles.absoluteComplement, eles.abscomp, eles.complement);
+aliases(eles.intersection, eles.intersect, eles.and, eles.n, eles['&'], eles['.']);
+aliases(eles.symmetricDifference, eles.symdiff, eles.xor, eles['^'], eles['(+)'], eles['(-)']);
+cy.collection([nodes[0]]).union(nodes[1]).union(eles.$id('g'));
+eles.difference(collNodes).abscomp().intersection(collSel).symdiff(collNodes);
+const diff = collSel.diff(collNodes);
+cy.collection().merge(diff.left).merge(diff.right).merge(diff.both).unmerge(collSel).filter((ele, i, eles) => true);
+
+eles.sort((a, b) => 1).map((ele, i, eles) => [i, ele]);
+eles.reduce<any[]>((prev, ele, i, eles) => [...prev, [ele, i]], []).concat(['finish']);
+const min = eles.min((ele, i, eles) => ele.id.length + i); min.ele.scratch('min', min.value);
+const max = eles.max((ele, i, eles) => ele.id.length + i); max.ele.scratch('max', max.value);
+
+// TODO: traversing (need to actively check the nodes/edeges distinction)
+// TODO: algorithms
+// TODO: compound nodes (there aren't any in current test case)
diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index e85041861a..95573226b1 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Cytoscape.js 3.1
+// Type definitions for Cytoscape.js 3.2
 // Project: http://js.cytoscape.org/
 // Definitions by:  Fabian Schmidt and Fred Eisele <https://github.com/phreed>
 //                  Shenghan Gao <https://github.com/wy193777>
@@ -9,7 +9,7 @@
 //
 // Translation from Objects in help to Typescript interface.
 // http://js.cytoscape.org/#notation/functions
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /**
  * cy   --> Cy.Core
@@ -361,7 +361,7 @@ declare namespace cytoscape {
          *
          * The default value is 1.
          */
-        pixelRatio?: number;
+        pixelRatio?: number | 'auto';
     }
 
     /**
@@ -386,35 +386,42 @@ declare namespace cytoscape {
         /**
          * Add elements to the graph and return them.
          */
-        add(eles: ElementDefinition | ElementDefinition[] | Collection): CollectionElements;
+        add(eles: ElementDefinition | ElementDefinition[] | CollectionArgument): CollectionReturnValue;
 
         /**
          * Remove elements in collecion or match the selector from the graph and return them.
          */
-        remove(eles: Collection | Selector): CollectionElements;
+        remove(eles: CollectionArgument | Selector): CollectionReturnValue;
 
         /**
          * Get a collection from elements in the graph matching the specified selector or from an array of elements.
          * If no parameter specified, an empty collection will be returned
          */
-        collection(eles?: Selector | CollectionElements[]): CollectionElements;
+        collection(eles?: Selector | CollectionArgument[]): CollectionReturnValue;
 
         /**
          * Get an element from its ID in a very performant way.
+         * http://js.cytoscape.org/#cy.getElementById
          */
-        getElementById(id: string): CollectionElements;
+        getElementById(id: string): CollectionReturnValue;
+
+        /**
+         * Get an element from its ID in a very performant way.
+         * http://js.cytoscape.org/#cy.getElementById
+         */
+        $id(id: string): CollectionReturnValue;
 
         /**
          * Get elements in the graph matching the specified selector.
          * http://js.cytoscape.org/#cy.$
          */
-        $(selector: Selector): CollectionElements;
+        $(selector: Selector): CollectionReturnValue;
 
         /**
          * Get elements in the graph matching the specified selector.
          * http://js.cytoscape.org/#cy.$
          */
-        elements(selector?: Selector): CollectionElements;
+        elements(selector?: Selector): CollectionReturnValue;
 
         /**
          * Get nodes in the graph matching the specified selector.
@@ -428,7 +435,7 @@ declare namespace cytoscape {
         /**
          * Get elements in the graph matching the specified selector or filter function.
          */
-        filter(selector: Selector | ((ele: Singular, i: number, eles: CollectionElements) => boolean)): CollectionElements;
+        filter(selector: Selector | ((ele: Singular, i: number, eles: CollectionArgument) => boolean)): CollectionReturnValue;
 
         /**
          * Allow for manipulation of elements without triggering multiple style calculations or multiple redraws.
@@ -599,14 +606,20 @@ declare namespace cytoscape {
         ready(fn: EventHandler): void;
     }
 
-    interface ZoomOptions {
-        /** The zoom level to set. */
-        level: number;
+    interface ZoomOptionsModel {
         /** The position about which to zoom. */
         position: Position;
+    }
+    interface ZoomOptionsRendered {
         /** The rendered position about which to zoom. */
         renderedPosition: Position;
     }
+    interface ZoomOptionsLevel {
+        /** The zoom level to set. */
+        level: number;
+    }
+    type ZoomOptions = ZoomOptionsLevel & (ZoomOptionsModel | ZoomOptionsRendered);
+
     /**
      * http://js.cytoscape.org/#core/viewport-manipulation
      */
@@ -615,14 +628,21 @@ declare namespace cytoscape {
          * Get the HTML DOM element in which the graph is visualised.
          * A null value is returned if the Core is headless.
          */
-        container(): any;
+        container(): Element | null;
 
         /**
          * Pan the graph to the centre of a collection.
          *
          * @param eles The collection to centre upon.
          */
-        center(eles?: Collection): CollectionElements;
+        center(eles?: CollectionArgument): this;
+
+        /**
+         * Pan the graph to the centre of a collection.
+         *
+         * @param eles The collection to centre upon.
+         */
+        centre(eles?: CollectionArgument): this;
 
         /**
          * Pan and zooms the graph to fit to a collection.
@@ -631,13 +651,13 @@ declare namespace cytoscape {
          * @param eles [optional] The collection to fit to.
          * @param padding [optional] An amount of padding (in pixels) to have around the graph
          */
-        fit(eles?: Collection, padding?: number): CollectionElements;
+        fit(eles?: CollectionArgument, padding?: number): this;
 
         /**
          * Reset the graph to the default zoom level and panning position.
          * http://js.cytoscape.org/#cy.reset
          */
-        reset(): CollectionElements;
+        reset(): this;
 
         /**
          * Get the panning position of the graph.
@@ -651,7 +671,7 @@ declare namespace cytoscape {
          *
          * @param renderedPosition The rendered position to pan the graph to.
          */
-        pan(renderedPosition?: Position): void;
+        pan(renderedPosition?: Position): this;
 
         /**
          * Relatively pan the graph by a specified rendered position vector.
@@ -659,7 +679,7 @@ declare namespace cytoscape {
          *
          * @param renderedPosition The rendered position vector to pan the graph by.
          */
-        panBy(renderedPosition: Position): void;
+        panBy(renderedPosition: Position): this;
 
         /**
          * Get whether panning is enabled.
@@ -867,7 +887,8 @@ declare namespace cytoscape {
          * there is no resize or style event for arbitrary DOM elements.
          * http://js.cytoscape.org/#cy.resize
          */
-        resize(): CollectionElements;
+        resize(): this;
+        invalidateDimensions(): this;
     }
 
     /**
@@ -875,15 +896,15 @@ declare namespace cytoscape {
      *
      */
     interface AnimationFitOptions {
-        eles: CollectionElements | Selector; // to which the viewport will be fitted.
+        eles: CollectionArgument | Selector; // to which the viewport will be fitted.
         padding: number; //  Padding to use with the fitting.
     }
     interface CenterOptions {
-        eles: CollectionElements | Selector; // to which the viewport will be selected.
+        eles: CollectionArgument | Selector; // to which the viewport will be selected.
     }
-    interface AnimateOptionsCommon {
+    interface AnimationOptions {
         /** A zoom level to which the graph will be animated. */
-        zoom?: number;
+        zoom?: ZoomOptions;
         /** A panning position to which the graph will be animated. */
         pan?: Position;
         /** A relative panning position to which the graph will be animated. */
@@ -892,11 +913,13 @@ declare namespace cytoscape {
         fit?: AnimationFitOptions;
         /** An object containing centring options from which the graph will be animated. */
         center?: CenterOptions;
+        /** easing - A transition-timing-function easing style string that shapes the animation progress curve. */
+        easing?: string; // TODO: explicit type
 
         /** duration - The duration of the animation in milliseconds. */
         duration?: number;
     }
-    interface AnimateOptions extends AnimateOptionsCommon {
+    interface AnimateOptions extends AnimationOptions {
         /** queue - A boolean indicating whether to queue the animation. */
         queue?: boolean;
         /** complete - A function to call when the animation is done. */
@@ -904,14 +927,6 @@ declare namespace cytoscape {
         /** step - A function to call each time the animation steps. */
         step?(): void;
     }
-    interface AnimationOptions extends AnimateOptionsCommon {
-        /** queue - A transition-timing-function easing style string that shapes the animation progress curve. */
-        easing?: boolean;
-        /** complete - A function to call when the animation is done. */
-        complete?(): void;
-        /** step - A function to call each time the animation steps. */
-        step?(): void;
-    }
 
     interface CoreAnimation {
         /**
@@ -993,6 +1008,7 @@ declare namespace cytoscape {
          * An analogue to make a layout on a subset of the graph exists as eles.makeLayout().
          */
         makeLayout(options: LayoutOptions): LayoutManipulation;
+        createLayout(options: LayoutOptions): LayoutManipulation;
     }
 
     /**
@@ -1080,17 +1096,18 @@ declare namespace cytoscape {
         /**
          * Export the current graph view as a JPG image in Base64 representation.
          */
-        jpg(options?: ExportOptions): string;
+        jpg(options?: ExportJpgOptions): string;
 
         /**
          * Export the current graph view as a JPG image in Base64 representation.
          */
-        jpeg(options?: ExportOptions): string;
+        jpeg(options?: ExportJpgOptions): string;
 
         /**
          * Export the graph as JSON, the same format used at initialisation.
          */
-        json(): string;
+        json(): object;
+        json(json: object): this;
     }
 
     /**
@@ -1100,13 +1117,14 @@ declare namespace cytoscape {
      * The input can be any element (node and edge) collection.
      * http://js.cytoscape.org/#collection
      */
-    interface Collection extends Singular,
+    interface Collection<TOut = SingularElementReturnValue, TIn = SingularElementArgument>
+        extends Singular,
         CollectionGraphManipulation, CollectionEvents,
         CollectionData, CollectionPosition,
         CollectionLayout,
         CollectionSelection, CollectionStyle, CollectionAnimation,
-        CollectionComparision, CollectionIteration,
-        CollectionBuildingUnion, CollectionAlgorithms { }
+        CollectionComparision, CollectionIteration<TIn, TOut>,
+        CollectionBuildingFiltering<TOut>, CollectionAlgorithms { }
 
     /**
      * ele  --> Cy.Singular
@@ -1127,7 +1145,8 @@ declare namespace cytoscape {
     /**
      * The output is a collection of node and edge elements OR single element.
      */
-    type CollectionElements = EdgeCollection | NodeCollection | SingularElement;
+    type CollectionArgument = EdgeCollection | NodeCollection | SingularElementArgument;
+    type CollectionReturnValue = EdgeCollection & NodeCollection & SingularElementReturnValue;
 
     /**
      * edges -> Cy.EdgeCollection
@@ -1135,7 +1154,7 @@ declare namespace cytoscape {
      *
      * The output is a collection of edge elements OR single edge.
      */
-    interface EdgeCollection extends Collection, EdgeSingular,
+    interface EdgeCollection extends Collection<EdgeSingular, EdgeSingular>, EdgeSingular,
         EdgeCollectionTraversing { }
     /**
      *  nodes -> Cy.NodeCollection
@@ -1143,19 +1162,18 @@ declare namespace cytoscape {
      *
      * The output is a collection of node elements OR single node.
      */
-    interface NodeCollection extends Collection, NodeSingular,
+    interface NodeCollection extends Collection<NodeSingular, NodeSingular>, NodeSingular,
         NodeCollectionMetadata, NodeCollectionPosition, NodeCollectionTraversing,
         NodeCollectionCompound { }
 
-    interface SingularElement extends EdgeSingular, NodeSingular {
-        // Intentionally empty.
-    }
+    type SingularElementArgument = EdgeSingular | NodeSingular;
+    type SingularElementReturnValue = EdgeSingular & NodeSingular;
     /**
      *  edge --> Cy.EdgeSingular
      *  a collection of a single edge
      */
     interface EdgeSingular extends Singular,
-        EdgeSingularData, EdgeSingularTraversing { }
+        EdgeSingularData, EdgeSingularPoints, EdgeSingularTraversing { }
 
     /**
      *  node --> Cy.NodeSingular
@@ -1172,24 +1190,24 @@ declare namespace cytoscape {
          * Remove the elements from the graph.
          * http://js.cytoscape.org/#eles.remove
          */
-        remove(): CollectionElements;
+        remove(): CollectionReturnValue;
 
         /**
          * Put removed elements back into the graph.
          * http://js.cytoscape.org/#eles.restore
          */
-        restore(): CollectionElements;
+        restore(): CollectionReturnValue;
 
         /**
          * Get a new collection containing clones (i.e. copies) of the elements in the calling collection.
          * http://js.cytoscape.org/#eles.clone
          */
-        clone(): CollectionElements;
+        clone(): CollectionReturnValue;
         /**
          * Get a new collection containing clones (i.e. copies) of the elements in the calling collection.
          * http://js.cytoscape.org/#eles.clone
          */
-        copy(): CollectionElements;
+        copy(): CollectionReturnValue;
 
         /**
          * Effectively move edges to different nodes. The modified (actually new) elements are returned.
@@ -1207,6 +1225,10 @@ declare namespace cytoscape {
      * http://js.cytoscape.org/#collection/graph-manipulation
      */
     interface SingularGraphManipulation {
+        /**
+         * Get the core instance that owns the element.
+         */
+        cy(): Core;
         /**
          * Get whether the element has been removed from the graph.
          * http://js.cytoscape.org/#ele.removed
@@ -1279,8 +1301,8 @@ declare namespace cytoscape {
          * http://js.cytoscape.org/#eles.removeData
          * @param names A space-separated list of fields to delete.
          */
-        removeData(names?: string): CollectionElements;
-        removeAttr(names?: string): CollectionElements;
+        removeData(names?: string): CollectionReturnValue;
+        removeAttr(names?: string): CollectionReturnValue;
 
         /**
          * Get an array of the plain JavaScript object
@@ -1313,6 +1335,22 @@ declare namespace cytoscape {
          * @param obj The object containing name- value pairs to update data fields.
          */
         data(obj: any): void;
+        /**
+         * Get a particular data field for the element.
+         * @param name The name of the field to get.
+         */
+        attr(name?: string): any;
+        /**
+         * Set a particular data field for the element.
+         * @param name The name of the field to set.
+         * @param value The value to set for the field.
+         */
+        attr(name: string, value: any): void;
+        /**
+         * Update multiple data fields at once via an object.
+         * @param obj The object containing name- value pairs to update data fields.
+         */
+        attr(obj: any): void;
 
         /**
          * Get or set the scratchpad at a particular namespace,
@@ -1461,17 +1499,77 @@ declare namespace cytoscape {
          * Get the (model) position of a node.
          */
         position(): Position;
+        /**
+         * Get the value of a specified position dimension.
+         * @param dimension The position dimension to set.
+         * @param value The value to set to the dimension.
+         */
+        position(dimension: PositionDimension): number;
         /**
          * Set the value of a specified position dimension.
          * @param dimension The position dimension to set.
          * @param value The value to set to the dimension.
          */
-        position(dimension: PositionDimension, value?: Position): void;
+        position(dimension: PositionDimension, value: number): this;
         /**
          * Set the position using name-value pairs in the specified object.
          * @param pos An object specifying name-value pairs representing dimensions to set.
          */
-        position(pos: Position): void;
+        position(pos: Position): this;
+        /**
+         * Get the (model) position of a node.
+         */
+        modelPosition(): Position;
+        /**
+         * Get the value of a specified position dimension.
+         * @param dimension The position dimension to set.
+         * @param value The value to set to the dimension.
+         */
+        modelPosition(dimension: PositionDimension): number;
+        /**
+         * Set the value of a specified position dimension.
+         * @param dimension The position dimension to set.
+         * @param value The value to set to the dimension.
+         */
+        modelPosition(dimension: PositionDimension, value: number): this;
+        /**
+         * Set the position using name-value pairs in the specified object.
+         * @param pos An object specifying name-value pairs representing dimensions to set.
+         */
+        modelPosition(pos: Position): this;
+        /**
+         * Get the (model) position of a node.
+         */
+        point(): Position;
+        /**
+         * Get the value of a specified position dimension.
+         * @param dimension The position dimension to set.
+         * @param value The value to set to the dimension.
+         */
+        point(dimension: PositionDimension): number;
+        /**
+         * Set the value of a specified position dimension.
+         * @param dimension The position dimension to set.
+         * @param value The value to set to the dimension.
+         */
+        point(dimension: PositionDimension, value: number): this;
+        /**
+         * Set the position using name-value pairs in the specified object.
+         * @param pos An object specifying name-value pairs representing dimensions to set.
+         */
+        point(pos: Position): this;
+
+        /**
+         * Shift the positions of the nodes by a given model position vector.
+         * @param dimension The position dimension to shift.
+         * @param value The value to shift the dimension.
+         */
+        shift(dimension: PositionDimension, value?: number): this;
+        /**
+         * Shift the positions of the nodes by a given model position vector.
+         * @param pos An object specifying name-value pairs representing dimensions to shift.
+         */
+        shift(pos: Position): this;
 
         /**
          * Get or set the rendered (on-screen) position of a node.
@@ -1542,8 +1640,8 @@ declare namespace cytoscape {
      * @param ele The element being iterated over for which the function should return a position to set.
      * @param ix The index of the element when iterating over the elements in the collection.
      */
-    type ElementPositionFunction = (ele: CollectionElements, ix: number) => void;
-    type ElementCollectionFunction = (ele: CollectionElements, ix: number, eles: CollectionElements) => void;
+    type ElementPositionFunction = (ele: NodeSingular, ix: number) => void;
+    type ElementCollectionFunction = (ele: NodeSingular, ix: number, eles: CollectionArgument) => void;
 
     /**
      * http://js.cytoscape.org/#collection/position--dimensions
@@ -1556,9 +1654,7 @@ declare namespace cytoscape {
          * http://js.cytoscape.org/#nodes.positions
          */
         positions(handler: ElementPositionFunction | Position): void;
-
         modelPositions(handler: ElementPositionFunction | Position): void;
-
         points(handler: ElementPositionFunction | Position): void;
 
         /**
@@ -1647,11 +1743,13 @@ declare namespace cytoscape {
          * http://js.cytoscape.org/#eles.boundingBox
          */
         boundingBox(options: BoundingBoxOptions): BoundingBox12 | BoundingBoxWH;
+        boundingbox(options: BoundingBoxOptions): BoundingBox12 | BoundingBoxWH;
         /**
          * Get the bounding box of the elements in rendered coordinates.
          * @param options An object containing options for the function.
          */
         renderedBoundingBox(options: BoundingBoxOptions): BoundingBox12 | BoundingBoxWH;
+        renderedBoundingbox(options: BoundingBoxOptions): BoundingBox12 | BoundingBoxWH;
     }
 
     /**
@@ -1668,9 +1766,9 @@ declare namespace cytoscape {
          *
          * @param options The layout options.
          */
-        layout(options: LayoutOptions): CollectionElements;
-        makeLayout(options: LayoutOptions): CoreLayout;
-        createLayout(options: LayoutOptions): CoreLayout;
+        layout(options: LayoutOptions): LayoutManipulation;
+        makeLayout(options: LayoutOptions): LayoutManipulation;
+        createLayout(options: LayoutOptions): LayoutManipulation;
     }
 
     /**
@@ -1684,7 +1782,7 @@ declare namespace cytoscape {
         // easing of animation, if enabled
         animationEasing?: number;
         // collection of elements involved in the layout; set by cy.layout() or eles.layout()
-        eles: CollectionElements;
+        eles: CollectionArgument;
         // whether to fit the viewport to the graph
         fit?: boolean;
         // padding to leave between graph and viewport
@@ -1811,11 +1909,50 @@ declare namespace cytoscape {
         flashClass(classes: ClassNames, duration?: number): void;
 
         /**
-         * Get or set a particular style property value.
-         * @param name The name of the visual style property to get.
+         * Set a particular style property value.
+         * @param name The name of the visual style property to set.
          * @param value The value to which the property is set.
          */
-        style(name?: string, value?: any): any;
+        style(name: string, value: any): this;
+        /**
+         * Get a particular style property value.
+         * @param name The name of the visual style property to get.
+         */
+        style(name: string): any;
+        /**
+         * Set several particular style property values.
+         * @param obj An object of style property name-value pairs to set.
+         */
+        style(obj: object): this;
+        /**
+         * Get a name-value pair object containing visual style properties and their values for the element.
+         */
+        style(): {[index: string]: any};
+        /**
+         * Set a particular style property value.
+         * @param name The name of the visual style property to set.
+         * @param value The value to which the property is set.
+         */
+        css(name: string, value: any): this;
+        /**
+         * Get a particular style property value.
+         * @param name The name of the visual style property to get.
+         */
+        css(name: string): any;
+        /**
+         * Set several particular style property values.
+         * @param obj An object of style property name-value pairs to set.
+         */
+        css(obj: object): this;
+        /**
+         * Get a name-value pair object containing visual style properties and their values for the element.
+         */
+        css(): {[index: string]: any};
+        /**
+         * Remove all or specific style overrides.
+         * @param names A space-separated list of property names to remove overrides
+         */
+        removeStyle(names?: string): this;
     }
 
     /**
@@ -1977,27 +2114,36 @@ declare namespace cytoscape {
          *
          * @param eles The other elements to compare to.
          */
-        same(eles: Collection): boolean;
+        same(eles: CollectionArgument): boolean;
 
         /**
          * Determine whether this collection contains any of the same elements as another collection.
          *
          * @param eles The other elements to compare to.
          */
-        anySame(eles: Collection): boolean;
+        anySame(eles: CollectionArgument): boolean;
+
+        /**
+         * Determine whether this collection contains all of the elements of another collection.
+         */
+        contains(eles: CollectionArgument): boolean;
+        /**
+         * Determine whether this collection contains all of the elements of another collection.
+         */
+        has(eles: CollectionArgument): boolean;
 
         /**
          * Determine whether all elements in the specified collection are in the neighbourhood of the calling collection.
          *
          * @param eles The other elements to compare to.
          */
-        allAreNeighbors(eles: Collection): boolean;
+        allAreNeighbors(eles: CollectionArgument): boolean;
         /**
          * Determine whether all elements in the specified collection are in the neighbourhood of the calling collection.
          *
          * @param eles The other elements to compare to.
          */
-        allAreNeighbours(eles: Collection): boolean;
+        allAreNeighbours(eles: CollectionArgument): boolean;
 
         /**
          * Determine whether any element in this collection matches a selector.
@@ -2021,7 +2167,7 @@ declare namespace cytoscape {
          * eles - The collection of elements being tested.
          * @param thisArg [optional] The value for this within the test function.
          */
-        some(test: (ele: CollectionElements, i: number, eles: CollectionElements) => boolean, thisArg?: any): boolean;
+        some(test: (ele: CollectionArgument, i: number, eles: CollectionArgument) => boolean, thisArg?: any): boolean;
 
         /**
          * Determine whether all elements in this collection satisfy the specified test function.
@@ -2032,13 +2178,13 @@ declare namespace cytoscape {
          * eles - The collection of elements being tested.
          * @param thisArg [optional] The value for this within the test function.
          */
-        every(test: (ele: CollectionElements, i: number, eles: CollectionElements) => boolean, thisArg?: any): boolean;
+        every(test: (ele: CollectionArgument, i: number, eles: CollectionArgument) => boolean, thisArg?: any): boolean;
     }
 
     /**
      * http://js.cytoscape.org/#collection/iteration
      */
-    interface CollectionIteration {
+    interface CollectionIteration<TOut, TIn> {
         /**
          * Get the number of elements in the collection.
          */
@@ -2070,8 +2216,8 @@ declare namespace cytoscape {
          * eles - The collection of elements being iterated.
          * @param thisArg [optional] The value for this within the iterating function.
          */
-        each(each: (ele: CollectionElements, i: number, eles: CollectionElements) => void | boolean, thisArg?: any): void;
-        forEach(each: (ele: CollectionElements, i: number, eles: CollectionElements) => void | boolean, thisArg?: any): void;
+        each(each: (ele: TIn, i: number, eles: this) => void | boolean, thisArg?: any): void;
+        forEach(each: (ele: TIn, i: number, eles: this) => void | boolean, thisArg?: any): void;
 
         /**
          * Get an element at a particular index in the collection.
@@ -2080,21 +2226,21 @@ declare namespace cytoscape {
          *
          * @param index The index of the element to get.
          */
-        eq(index: number): CollectionElements;
+        eq(index: number): TOut;
         /**
          * Get an element at a particular index in the collection.
          *
          * @param index The index of the element to get.
          */
-        [index: number]: CollectionElements;
+        [index: number]: TOut;
         /**
          * Get the first element in the collection.
          */
-        first(): CollectionElements;
+        first(): TOut;
         /**
          * Get the last element in the collection.
          */
-        last(): CollectionElements;
+        last(): TOut;
 
         /**
          * Get a subset of the elements in the collection based on specified indices.
@@ -2106,7 +2252,12 @@ declare namespace cytoscape {
          *            If omitted, all elements from the start position and to the end of the array will be selected.
          *            Use negative numbers to select from the end of an array.
          */
-        slice(start?: number, end?: number): CollectionElements;
+        slice(start?: number, end?: number): this;
+
+        /**
+         * Get the collection as an array, maintaining the order of the elements.
+         */
+        toArray(): SingularElementReturnValue[];
     }
 
     /**
@@ -2118,7 +2269,7 @@ declare namespace cytoscape {
      * @param eles The elements or array of elements to add or elements in the graph matching the selector.
      * http://js.cytoscape.org/#eles.union
      */
-    type CollectionBuildingUnionFunc = (eles: Collection | Collection[] | Selector) => CollectionElements;
+    type CollectionBuildingUnionFunc = (eles: CollectionArgument | CollectionArgument[] | Selector) => CollectionReturnValue;
 
     /**
      * Get a new collection, resulting from the collection without some specified elements.
@@ -2126,7 +2277,7 @@ declare namespace cytoscape {
      * @param eles The elements that will not be in the resultant collection.
      *             Elements from the calling collection matching this selector will not be in the resultant collection.
      */
-    type CollectionBuildingDifferenceFunc = (eles: Collection | Selector) => CollectionElements;
+    type CollectionBuildingDifferenceFunc = (eles: CollectionArgument | Selector) => CollectionReturnValue;
 
     /**
      * Get the elements in both this collection and another specified collection.
@@ -2135,7 +2286,7 @@ declare namespace cytoscape {
      *             A selector representing the elements to intersect with.
      *             All elements in the graph matching the selector are used as the passed collection.
      */
-    type CollectionBuildingIntersectionFunc = (eles: Collection | Selector) => CollectionElements;
+    type CollectionBuildingIntersectionFunc = (eles: CollectionArgument | Selector) => CollectionReturnValue;
 
     /**
      * Get the elements that are in the calling collection or the passed collection but not in both.
@@ -2144,40 +2295,52 @@ declare namespace cytoscape {
      *             A selector representing the elements to apply the symmetric difference with.
      *             All elements in the graph matching the selector are used as the passed collection.
      */
-    type CollectionSymmetricDifferenceFunc = (eles: Collection | Selector) => CollectionElements;
+    type CollectionSymmetricDifferenceFunc = (eles: CollectionArgument | Selector) => CollectionReturnValue;
     /**
      * http://js.cytoscape.org/#collection/building--filtering
      */
-    interface CollectionBuildingUnion {
+    interface CollectionBuildingFiltering<TOut> {
+        /**
+         * Get an element in the collection from its ID in a very performant way.
+         * @param id The ID of the element to get.
+         */
+        getElementById(id: string): TOut;
+        /**
+         * Get an element in the collection from its ID in a very performant way.
+         * @param id The ID of the element to get.
+         */
+        $id(id: string): TOut;
+
         /**
          * Get a new collection, resulting from adding the collection with another one
          * http://js.cytoscape.org/#eles.union
          */
         union: CollectionBuildingUnionFunc;
-        // [index: "u"]: CollectionBuildingUnionFunc;
+        u: CollectionBuildingUnionFunc;
         add: CollectionBuildingUnionFunc;
-        // [index: "+"]: CollectionBuildingUnionFunc;
+        '+': CollectionBuildingUnionFunc;
         or: CollectionBuildingUnionFunc;
-        // [index: "|"]: CollectionBuildingUnionFunc;
+        '|': CollectionBuildingUnionFunc;
 
         /**
          * Get a new collection, resulting from the collection without some specified elements.
          * http://js.cytoscape.org/#eles.difference
          */
         difference: CollectionBuildingDifferenceFunc;
-        // [index: "\\"]: CollectionBuildingDifferenceFunc;
+        subtract: CollectionBuildingDifferenceFunc;
+        '\\': CollectionBuildingDifferenceFunc;
         not: CollectionBuildingDifferenceFunc;
-        // [index: "!"]: CollectionBuildingDifferenceFunc;
+        '!': CollectionBuildingDifferenceFunc;
         relativeComplement: CollectionBuildingDifferenceFunc;
-        // [index: "-"]: CollectionBuildingDifferenceFunc;
+        '-': CollectionBuildingDifferenceFunc;
 
         /**
          * Get all elements in the graph that are not in the calling collection.
          * http://js.cytoscape.org/#eles.absoluteComplement
          */
-        absoluteComplement(): CollectionElements;
-        abscomp(): CollectionElements;
-        complement(): CollectionElements;
+        absoluteComplement(): CollectionReturnValue;
+        abscomp(): CollectionReturnValue;
+        complement(): CollectionReturnValue;
 
         /**
          * Get the elements in both this collection and another specified collection.
@@ -2186,9 +2349,9 @@ declare namespace cytoscape {
         intersection: CollectionSymmetricDifferenceFunc;
         intersect: CollectionSymmetricDifferenceFunc;
         and: CollectionSymmetricDifferenceFunc;
-        // [index: "n"]: CollectionSymmetricDifferenceFunc;
-        // [index: "&"]: CollectionSymmetricDifferenceFunc;
-        // [index: "."]: CollectionSymmetricDifferenceFunc;
+        n: CollectionSymmetricDifferenceFunc;
+        '&': CollectionSymmetricDifferenceFunc;
+        '.': CollectionSymmetricDifferenceFunc;
 
         /**
          * Get the elements that are in the calling collection
@@ -2198,11 +2361,9 @@ declare namespace cytoscape {
         symmetricDifference: CollectionSymmetricDifferenceFunc;
         symdiff: CollectionSymmetricDifferenceFunc;
         xor: CollectionSymmetricDifferenceFunc;
-        // [index: "^"]: CollectionSymmetricDifferenceFunc;
-        // [index: "(+)"]: CollectionSymmetricDifferenceFunc;
-        // [index: "(-)"]: CollectionSymmetricDifferenceFunc;
-
-        // [index: string]: CollectionBuildingDifferenceFunc |CollectionBuildingUnionFunc | CollectionBuildingDifferenceFunc | CollectionSymmetricDifferenceFunc;
+        '^': CollectionSymmetricDifferenceFunc;
+        '(+)': CollectionSymmetricDifferenceFunc;
+        '(-)': CollectionSymmetricDifferenceFunc;
 
         /**
          * Perform a traditional left/right diff on the two collections.
@@ -2216,12 +2377,62 @@ declare namespace cytoscape {
          * both - is the set of elements in both collections.
          * http://js.cytoscape.org/#eles.diff
          */
-        diff(selector: Selector | Collection): {
-            left: CollectionElements,
-            right: CollectionElements,
-            both: CollectionElements
+        diff(selector: Selector | CollectionArgument): {
+            left: CollectionReturnValue,
+            right: CollectionReturnValue,
+            both: CollectionReturnValue
         };
 
+        /**
+         * Perform a in-place merge of the given elements into the calling collection.
+         * @param eles The elements to merge in-place or a selector representing the elements to merge.
+         * All elements in the graph matching the selector are used as the passed collection.
+         *
+         * This function modifies the calling collection instead of returning a new one.
+         * Use of this function should be considered for performance in some cases, but otherwise should be avoided. Consider using eles.union() instead.
+         * Use this function only on new collections that you create yourself, using cy.collection().
+         * This ensures that you do not unintentionally modify another collection.
+         *
+         * Examples
+         * With a collection:
+         * @example
+         * var col = cy.collection(); // new, empty collection
+         * var j = cy.$('#j');
+         * var e = cy.$('#e');
+         * col.merge( j ).merge( e );
+         *
+         * With a selector:
+         * @example
+         * var col = cy.collection(); // new, empty collection
+         * col.merge('#j').merge('#e');
+         */
+        merge(eles: CollectionArgument | string): this;
+        /**
+         * Perform an in-place operation on the calling collection to remove the given elements.
+         * @param eles The elements to remove  in-place or a selector representing the elements to remove .
+         * All elements in the graph matching the selector are used as the passed collection.
+         *
+         * This function modifies the calling collection instead of returning a new one.
+         * Use of this function should be considered for performance in some cases, but otherwise should be avoided. Consider using eles.filter() or eles.remove() instead.
+         * Use this function only on new collections that you create yourself, using cy.collection().
+         * This ensures that you do not unintentionally modify another collection.
+         *
+         * Examples
+         * With a collection:
+         * @example
+         * var col = cy.collection(); // new, empty collection
+         * var e = cy.$('#e');
+         * col.merge( cy.nodes() );
+         * col.unmerge( e );
+         *
+         * With a selector:
+         * @example
+         * var col = cy.collection(); // new, empty collection
+         * col.merge( cy.nodes() );
+         * col.unmerge('#e');
+         */
+        unmerge(eles: CollectionArgument | string): this;
+
         /**
          * Get a new collection containing elements that are accepted by the specified filter.
          *
@@ -2231,7 +2442,7 @@ declare namespace cytoscape {
          * ele - The element being considered.
          * http://js.cytoscape.org/#eles.filter
          */
-        filter(selector: Selector | ((ele: Singular, i: number, eles: CollectionElements) => boolean)): CollectionElements;
+        filter(selector: Selector | ((ele: TOut, i: number, eles: CollectionArgument) => boolean)): CollectionReturnValue;
         /**
          * Get the nodes that match the specified selector.
          *
@@ -2257,7 +2468,7 @@ declare namespace cytoscape {
          *
          * http://js.cytoscape.org/#eles.sort
          */
-        sort(sort: (ele1: CollectionElements, ele2: CollectionElements) => number): CollectionElements;
+        sort(sort: (ele1: CollectionArgument, ele2: CollectionArgument) => number): CollectionReturnValue;
 
         /**
          * Get an array containing values mapped from the collection.
@@ -2270,7 +2481,7 @@ declare namespace cytoscape {
          *
          * http://js.cytoscape.org/#eles.map
          */
-        map(fn: (ele: CollectionElements, i: number, eles: CollectionElements) => any, thisArg?: any): any[];
+        map(fn: (ele: CollectionArgument, i: number, eles: CollectionArgument) => any, thisArg?: any): any[];
 
         /**
          * Reduce a single value by applying a
@@ -2282,11 +2493,13 @@ declare namespace cytoscape {
          * ele The current element.
          * ix The index of the current element.
          * eles The collection of elements being reduced.
-         *
+         * @param initialValue The initial value for reducing
+         * It is used also for type inference of output, but the type can be
+         * also stated explicitly as generic
          * http://js.cytoscape.org/#eles.reduce
          */
-        reduce(fn: (prevVal: any, ele: CollectionElements,
-            ix: number, eles: CollectionElements) => any): number[];
+        reduce<T>(fn: (prevVal: T, ele: SingularElementReturnValue,
+            ix: number, eles: CollectionReturnValue) => T, initialValue: T): T;
 
         /**
          * Find a minimum value in a collection.
@@ -2299,7 +2512,7 @@ declare namespace cytoscape {
          *
          * http://js.cytoscape.org/#eles.min
          */
-        min(fn: (ele: CollectionElements, i: number, eles: CollectionElements) => any, thisArg?: any): {
+        min(fn: (ele: CollectionArgument, i: number, eles: CollectionArgument) => any, thisArg?: any): {
             /**
              * The minimum value found.
              */
@@ -2307,7 +2520,7 @@ declare namespace cytoscape {
             /**
              * The element that corresponds to the minimum value.
              */
-            ele: CollectionElements
+            ele: CollectionArgument
         };
 
         /**
@@ -2321,7 +2534,7 @@ declare namespace cytoscape {
          *
          * http://js.cytoscape.org/#eles.max
          */
-        max(fn: (ele: CollectionElements, i: number, eles: CollectionElements) => any, thisArg?: any): {
+        max(fn: (ele: CollectionArgument, i: number, eles: CollectionArgument) => any, thisArg?: any): {
             /**
              * The maximum value found.
              */
@@ -2329,7 +2542,7 @@ declare namespace cytoscape {
             /**
              * The element that corresponds to the maximum value.
              */
-            ele: CollectionElements
+            ele: CollectionArgument
         };
     }
 
@@ -2351,7 +2564,7 @@ declare namespace cytoscape {
          *
          * @param selector [optional] An optional selector that is used to filter the resultant collection.
          */
-        neighborhood(selector?: Selector): CollectionElements;
+        neighborhood(selector?: Selector): CollectionReturnValue;
 
         /**
          * Get the open neighbourhood of the elements.
@@ -2362,7 +2575,7 @@ declare namespace cytoscape {
          *
          * @param selector [optional] An optional selector that is used to filter the resultant collection.
          */
-        openNeighborhood(selector?: Selector): CollectionElements;
+        openNeighborhood(selector?: Selector): CollectionReturnValue;
         /**
          * Get the closed neighbourhood of the elements.
          *
@@ -2372,13 +2585,54 @@ declare namespace cytoscape {
          *
          * @param selector [optional] An optional selector that is used to filter the resultant collection.
          */
-        closedNeighborhood(selector?: Selector): CollectionElements;
+        closedNeighborhood(selector?: Selector): CollectionReturnValue;
 
         /**
          * Get the connected components, considering only the elements in the calling collection.
          * An array of collections is returned, with each collection representing a component.
          */
-        components(): Collection;
+        components(): CollectionReturnValue[];
+    }
+    /**
+     * http://js.cytoscape.org/#collection/edge-points
+     */
+    interface EdgeSingularPoints {
+        /**
+         * Get an array of control point model positions for a {@code curve-style: bezier) or {@code curve-style: unbundled-bezier} edge.
+         *
+         * While the control points may be specified relatively in the CSS,
+         * this function returns the absolute model positions of the control points.
+         * The points are specified in the order of source-to-target direction.
+         * This function works for bundled beziers, but it is not applicable to the middle, straight-line edge in the bundle.
+         */
+        controlPoints(): Position[];
+        /**
+         * Get an array of segment point model positions (i.e. bend points) for a {@code curve-style: segments} edge.
+         *
+         * While the segment points may be specified relatively in the stylesheet,
+         * this function returns the absolute model positions of the segment points.
+         * The points are specified in the order of source-to-target direction.
+         */
+        segmentPoints(): Position[];
+        /**
+         * Get the model position of where the edge ends, towards the source node.
+         */
+        sourceEndpoint(): Position;
+        /**
+         * Get the model position of where the edge ends, towards the target node.
+         */
+        targetEndpoint(): Position;
+        /**
+         * Get the model position of the midpoint of the edge.
+         *
+         * The midpoint is, by default, where the edge’s label is centred. It is also the position towards which mid arrows point.
+         * For curve-style: unbundled-bezier edges, the midpoint is the middle extremum if the number of control points is odd.
+         * For an even number of control points, the midpoint is where the two middle-most control points meet.
+         * This is the middle inflection point for bilaterally symmetric or skew symmetric edges, for example.
+         * For curve-style: segments edges, the midpoint is the middle segment point if the number of segment points is odd.
+         * For an even number of segment points, the overall midpoint is the midpoint of the middle-most line segment (i.e. the mean of the middle two segment points).
+         */
+        midpoint(): Position;
     }
     interface EdgeSingularTraversing {
         /**
@@ -2457,7 +2711,7 @@ declare namespace cytoscape {
          * @param eles The other collection.
          * @param selector The other collection, specified as a selector which is matched against all elements in the graph.
          */
-        edgesWith(eles: Collection | Selector): EdgeCollection;
+        edgesWith(eles: CollectionArgument | Selector): EdgeCollection;
 
         /**
          * Get the edges coming from the collection (i.e. the source) going to another collection (i.e. the target).
@@ -2465,7 +2719,7 @@ declare namespace cytoscape {
          * @param eles The other collection.
          * @param selector The other collection, specified as a selector which is matched against all elements in the graph.
          */
-        edgesTo(eles: Collection | Selector): EdgeCollection;
+        edgesTo(eles: CollectionArgument | Selector): EdgeCollection;
 
         /**
          * Get the edges connected to the nodes in the collection.
@@ -2537,7 +2791,7 @@ declare namespace cytoscape {
         /**
          * The root nodes (selector or collection) to start the search from.
          */
-        roots: Selector | Collection;
+        roots: Selector | CollectionArgument;
         /**
          * A handler function that is called when a node is visited in the search.
          */
@@ -2552,7 +2806,7 @@ declare namespace cytoscape {
          * The path of the search.
          * - The path returned includes edges such that if path[i] is a node, then path[i - 1] is the edge used to get to that node.
          */
-        path: CollectionElements;
+        path: CollectionArgument;
         /**
          * The node found by the search
          * - If no node was found, then found is empty.
@@ -2568,7 +2822,7 @@ declare namespace cytoscape {
         /**
          * The root node (selector or collection) where the algorithm starts.
          */
-        root: Selector | Collection;
+        root: Selector | CollectionArgument;
 
         /**
          * A function that returns the positive numeric weight for this edge.
@@ -2596,14 +2850,14 @@ declare namespace cytoscape {
          * The path starts with the source node and includes the edges between the nodes in the path such that if pathTo(node)[i] is an edge,
          * then pathTo(node)[i-1] is the previous node in the path and pathTo(node)[i+1] is the next node in the path.
          */
-        pathTo(node: NodeSingular): Collection;
+        pathTo(node: NodeSingular): CollectionReturnValue;
     }
     /**
      * http://js.cytoscape.org/#eles.aStar
      */
     interface SearchAStarOptions {
-        root: Selector | Collection;
-        goal: Selector | Collection;
+        root: Selector | CollectionArgument;
+        goal: Selector | CollectionArgument;
         weight?: WeightFn;
         heuristic?(node: NodeCollection): number;
         directed?: boolean;
@@ -2614,7 +2868,7 @@ declare namespace cytoscape {
     interface SearchAStarResult {
         found: boolean;
         distance: number;
-        path: Collection;
+        path: CollectionReturnValue;
     }
 
     /**
@@ -2641,7 +2895,7 @@ declare namespace cytoscape {
          * then pathTo(node)[i-1] is the previous node in the path and pathTo(node)[i+1]
          * is the next node in the path.
          */
-        path(fromNode: NodeSingular | CollectionSelection, toNode: NodeSingular | Selector): Collection;
+        path(fromNode: NodeSingular | CollectionSelection, toNode: NodeSingular | Selector): CollectionReturnValue;
     }
 
     /**
@@ -2670,7 +2924,7 @@ declare namespace cytoscape {
          * function that computes the shortest path from root node to the argument node
          * (either objects or selector string)
          */
-        pathTo(node: NodeSingular | Selector): Collection;
+        pathTo(node: NodeSingular | Selector): CollectionReturnValue;
 
         /**
          *  function that computes the shortest distance from root node to argument node
@@ -4368,13 +4622,13 @@ declare namespace cytoscape {
          * Start running the layout
          * http://js.cytoscape.org/#layout.run
          */
-        run(): void;
-        start(): void;
+        run(): this;
+        start(): this;
         /**
          * Stop running the (asynchronous/discrete) layout
          * http://js.cytoscape.org/#layout.stop
          */
-        stop(): void;
+        stop(): this;
     }
     interface LayoutEvents {
         /**

From 2bc5077b3ade395ecb37a950ed9c1dbfe18c98a4 Mon Sep 17 00:00:00 2001
From: Cerberuser <computers05@mail.ru>
Date: Sat, 9 Jun 2018 14:43:53 +0700
Subject: [PATCH 073/141] Fix for selector functions

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

diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index 95573226b1..a3226defd2 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -2449,14 +2449,14 @@ declare namespace cytoscape {
          * @param selector The selector to match against.
          * http://js.cytoscape.org/#eles.filter
          */
-        nodes(selector: Selector): NodeCollection;
+        nodes(selector?: Selector): NodeCollection;
         /**
          * Get the edges that match the specified selector.
          *
          * @param selector The selector to match against.
          * http://js.cytoscape.org/#eles.filter
          */
-        edges(selector: Selector): EdgeCollection;
+        edges(selector?: Selector): EdgeCollection;
 
         /**
          * Get a new collection containing the elements sorted by the

From 7f9f32d9c208c65f4a015bc08e2a6606b2b23f67 Mon Sep 17 00:00:00 2001
From: khanhas <xuankhanh963@gmail.com>
Date: Sun, 10 Jun 2018 02:39:55 +0700
Subject: [PATCH 074/141] Added Area Text

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

diff --git a/types/proton-native/index.d.ts b/types/proton-native/index.d.ts
index b49efe6014..23c980fd73 100644
--- a/types/proton-native/index.d.ts
+++ b/types/proton-native/index.d.ts
@@ -169,6 +169,55 @@ export interface AreaPathProps extends AreaBaseProps {
 
 export class AreaPath extends React.Component<AreaPathProps> { }
 
+export interface AreaTextProps extends AreaBaseProps {
+    /**
+     * The background color, specified as a CSS color string.
+     */
+    backgroundColor?: string;
+    /**
+     * The text color, specified as a CSS color string.
+     */
+    color?: string;
+    /**
+     * The font family (only if available on the system).
+     */
+    fontFamily?: string;
+    /**
+     * The font size (in pt).
+     */
+    fontSize?: number;
+    /**
+     * Whether an italic font should be used.
+     */
+    fontStyle?: 'normal' | 'oblique' | 'italic';
+    /**
+     * Whether a bold font should be used (and the amount).
+     */
+    fontWeight?: 'minimum' | 'thin' | 'ultraLight' | 'light' | 'book' | 'normal' | 'medium' | 'semiBold' | 'bold' | 'ultraBold' | 'heavy' | 'ultraHeavy' | 'maximum' | number;
+    /**
+     * Wheter the text should be aligned to the left, center or right.
+     *
+     * **Works only on a top level text component, not it's children!**
+     */
+    textAlign?: 'left' | 'center' | 'right';
+    /**
+     * How wide or narrow the characters should be.
+     */
+    textStretch?: 'ultraCondensed' | 'extraCondensed' | 'condensed' | 'semiCondensed' | 'normal' | 'semiExpanded' | 'expanded' | 'extraExpanded' | 'ultraExpanded';
+    /**
+     * The text underline style.
+     */
+    textUnderline?: 'none' | 'single' | 'double' | 'suggestion';
+    /**
+     * The text underline color.
+     *
+     * A color string | 'spelling' | 'grammar' | 'auxiliary'
+     */
+    textUnderlineColor?: 'spelling' | 'grammar' | 'auxiliary' | string;
+}
+
+export class AreaText extends React.Component<AreaTextProps> { }
+
 export interface MouseEvent {
     button: number;
     height: number;
@@ -256,6 +305,10 @@ export class Area extends React.Component<AreaProps> {
      * A rectangle to be displayed in an Area component.
      */
     static Rectangle: typeof AreaRectangle;
+    /**
+     * A (possibly styled) text to be displayed in an Area component. Nested `Area.Text` components inheirit the parent's style.
+     */
+    static Text: typeof AreaText;
 }
 
 export interface BoxProps extends GridChildrenProps, Label, Stretchy {

From 70c88af46e89b67e0609c05034b655ce45287fa4 Mon Sep 17 00:00:00 2001
From: khanhas <xuankhanh963@gmail.com>
Date: Sun, 10 Jun 2018 02:54:37 +0700
Subject: [PATCH 075/141] Added test for Area

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

diff --git a/types/proton-native/test/index.tsx b/types/proton-native/test/index.tsx
index 8fcf7c7046..6b09fb0d64 100644
--- a/types/proton-native/test/index.tsx
+++ b/types/proton-native/test/index.tsx
@@ -124,3 +124,18 @@ class GridTest extends React.Component {
         );
     }
 }
+
+class AreaTest extends React.Component {
+    render() {
+        return (
+            <Area>
+                <Area.Rectangle height={10} width={20} x={30} y={40} />
+                <Area.Path d="test" fillMode="nonzero" />
+                <Area.Text fontSize={30}>
+                    Parent text
+                    <Area.Text fontWeight="maximum">Nested Text</Area.Text>
+                </Area.Text>
+            </Area>
+        );
+    }
+}

From 9b615f3a7602134b71ed9ebd1edfb6737128c3b4 Mon Sep 17 00:00:00 2001
From: Andrew Makarov <me@r3nya.ru>
Date: Sat, 9 Jun 2018 11:42:17 +0300
Subject: [PATCH 076/141] Add dns.lookupService method

---
 types/node/index.d.ts       | 7 +++++++
 types/node/node-tests.ts    | 6 ++++++
 types/node/v4/index.d.ts    | 2 ++
 types/node/v4/node-tests.ts | 6 ++++++
 types/node/v6/index.d.ts    | 2 ++
 types/node/v6/node-tests.ts | 6 ++++++
 types/node/v7/index.d.ts    | 2 ++
 types/node/v7/node-tests.ts | 6 ++++++
 types/node/v8/index.d.ts    | 6 ++++++
 types/node/v8/node-tests.ts | 6 ++++++
 10 files changed, 49 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 070c668e11..7bbc6ef651 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -24,6 +24,7 @@
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 //                 Alexander T. <https://github.com/a-tarasyuk>
 //                 Lishude <https://github.com/islishude>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -2540,6 +2541,12 @@ declare module "dns" {
         export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
     }
 
+    export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
+
+    export namespace lookupService {
+        export function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>;
+    }
+
     export interface ResolveOptions {
         ttl: boolean;
     }
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 740ad1f61a..14a939fb81 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -3114,6 +3114,12 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
+    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _hostname: string = hostname;
+        const _service: string = service;
+    });
+
     dns.resolve("nodejs.org", (err, addresses) => {
         const _addresses: string[] = addresses;
     });
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index dab3b0c5d9..58dc079f70 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -1445,6 +1445,8 @@ declare module "dns" {
     export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
     export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
 
+    export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
+
     export interface MxRecord {
         priority: number;
         exchange: string;
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index 6409e83e18..a9471f2bd6 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -1196,6 +1196,12 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
+    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _hostname: string = hostname;
+        const _service: string = service;
+    });
+
     dns.resolve("nodejs.org", (err, addresses) => {
         const _addresses: string[] = addresses;
     });
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 570e668c53..0644a6dccd 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -2057,6 +2057,8 @@ declare module "dns" {
     export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
     export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
 
+    export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
+
     export interface MxRecord {
         priority: number;
         exchange: string;
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 4457f83492..2d0666e322 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -2407,6 +2407,12 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
+    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _hostname: string = hostname;
+        const _service: string = service;
+    });
+
     dns.resolve("nodejs.org", (err, addresses) => {
         const _addresses: string[] = addresses;
     });
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 055933977d..cd76d4b038 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -2100,6 +2100,8 @@ declare module "dns" {
     export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void;
     export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void;
 
+    export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
+
     export interface ResolveOptions {
         ttl: boolean;
     }
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index 0ea05066b4..4d99c91841 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -2398,6 +2398,12 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
+    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _hostname: string = hostname;
+        const _service: string = service;
+    });
+
     dns.resolve("nodejs.org", (err, addresses) => {
         const _addresses: string[] = addresses;
     });
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index bc4fa2d749..ec19101c0a 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -2444,6 +2444,12 @@ declare module "dns" {
         export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
     }
 
+    export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
+
+    export namespace lookupService {
+        export function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>;
+    }
+
     export interface ResolveOptions {
         ttl: boolean;
     }
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index d37aa70ad5..3033956017 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -3075,6 +3075,12 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
+    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _hostname: string = hostname;
+        const _service: string = service;
+    });
+
     dns.resolve("nodejs.org", (err, addresses) => {
         const _addresses: string[] = addresses;
     });

From cd42596d4ebf2855a99cb53df55bdd27d6d467ad Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 21:55:06 +0200
Subject: [PATCH 077/141] Add a text encoding step to example 8.9

---
 types/whatwg-streams/whatwg-streams-tests.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/types/whatwg-streams/whatwg-streams-tests.ts b/types/whatwg-streams/whatwg-streams-tests.ts
index c7ed11928b..56246e0d97 100644
--- a/types/whatwg-streams/whatwg-streams-tests.ts
+++ b/types/whatwg-streams/whatwg-streams-tests.ts
@@ -371,11 +371,13 @@ declare class Request {
     readonly url: string;
 }
 declare class Response {
-    constructor(body?: ReadableStream<any>);
-    readonly body: ReadableStream<ArrayBufferView>;
+    constructor(body?: ReadableStream);
+    readonly body: ReadableStream;
 }
 declare class TextDecoderStream extends TransformStream<string, ArrayBufferView> {
 }
+declare class TextEncoderStream extends TransformStream<Uint8Array, string> {
+}
 
 class LipFuzzTransformer implements TransformStreamTransformer<string, string> {
     substitutions: Dictionary<string>;
@@ -439,7 +441,9 @@ class LipFuzzTransformer implements TransformStreamTransformer<string, string> {
                 // Decode the binary-encoded response to string
                 .pipeThrough(new TextDecoderStream())
                 // Apply the LipFuzzTransformer
-                .pipeThrough(ts);
+                .pipeThrough(ts)
+                // Encode the transformed string
+                .pipeThrough(new TextEncoderStream());
             return new Response(transformedBody);
         })
     );

From 0e0f609c5513b406d2a0551f4d788ed2a2d71704 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 21:57:57 +0200
Subject: [PATCH 078/141] Fix indentation

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index 82672a7a12..c00295db5e 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -32,8 +32,8 @@ export interface PipeOptions {
 }
 
 export interface WritableReadablePair<T extends WritableStream<any>, U extends ReadableStream<any>> {
-  writable: T;
-  readable: U;
+    writable: T;
+    readable: U;
 }
 
 declare class ReadableStream<R = ArrayBufferView> {
@@ -148,22 +148,22 @@ declare class CountQueuingStrategy {
 }
 
 declare interface TransformStreamTransformer<R, W> {
-  start?(controller: TransformStreamDefaultController<R>): void | Promise<void>;
-  transform?(chunk: W, controller: TransformStreamDefaultController<R>): void | Promise<void>;
-  flush?(controller: TransformStreamDefaultController<R>): void | Promise<void>;
+    start?(controller: TransformStreamDefaultController<R>): void | Promise<void>;
+    transform?(chunk: W, controller: TransformStreamDefaultController<R>): void | Promise<void>;
+    flush?(controller: TransformStreamDefaultController<R>): void | Promise<void>;
 }
 
 declare class TransformStream<R, W> implements WritableReadablePair<WritableStream<W>, ReadableStream<R>> {
-  constructor(transformer?: TransformStreamTransformer<R, W>, writableStrategy?: QueuingStrategy<W>, readableStrategy?: QueuingStrategy<R>);
+    constructor(transformer?: TransformStreamTransformer<R, W>, writableStrategy?: QueuingStrategy<W>, readableStrategy?: QueuingStrategy<R>);
 
-  readonly readable: ReadableStream<R>;
-  readonly writable: WritableStream<W>;
+    readonly readable: ReadableStream<R>;
+    readonly writable: WritableStream<W>;
 }
 
 declare class TransformStreamDefaultController<R> {
-  enqueue(chunk: R): void;
-  error(reason: any): void;
-  terminate(): void;
+    enqueue(chunk: R): void;
+    error(reason: any): void;
+    terminate(): void;
 
-  readonly desiredSize: number;
+    readonly desiredSize: number;
 }

From aed6ac7130f4e4992f7c9c8eb8b87fd7d3840906 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 22:00:02 +0200
Subject: [PATCH 079/141] Add readonly

---
 types/whatwg-streams/index.d.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index c00295db5e..45ff8fe7db 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -40,7 +40,7 @@ declare class ReadableStream<R = ArrayBufferView> {
     constructor(underlyingSource?: ReadableStreamSource<R>, strategy?: QueuingStrategy<R>);
     constructor(underlyingSource?: ReadableByteStreamSource<R>, strategy?: QueuingStrategy<R>);
 
-    locked: boolean;
+    readonly locked: boolean;
 
     cancel(reason: string): Promise<void>;
     getReader(): ReadableStreamDefaultReader<R>;
@@ -53,7 +53,7 @@ declare class ReadableStream<R = ArrayBufferView> {
 declare class ReadableStreamDefaultReader<R = ArrayBufferView> {
     constructor(stream: ReadableStream<R>);
 
-    closed: Promise<void>;
+    readonly closed: Promise<void>;
 
     cancel(reason: string): Promise<void>;
     read(): Promise<IteratorResult<R>>;
@@ -63,7 +63,7 @@ declare class ReadableStreamDefaultReader<R = ArrayBufferView> {
 declare class ReadableStreamBYOBReader<R = ArrayBufferView> {
     constructor(stream: ReadableStream);
 
-    closed: Promise<void>;
+    readonly closed: Promise<void>;
 
     cancel(reason: string): Promise<void>;
     read(view: R): Promise<IteratorResult<R>>;
@@ -73,7 +73,7 @@ declare class ReadableStreamBYOBReader<R = ArrayBufferView> {
 declare class ReadableStreamDefaultController<R = ArrayBufferView> {
     constructor(stream: ReadableStream, underlyingSource: ReadableStreamSource<R>, size: number, highWaterMark: number);
 
-    desiredSize: number;
+    readonly desiredSize: number;
 
     close(): void;
     enqueue(chunk: R): number;
@@ -83,8 +83,8 @@ declare class ReadableStreamDefaultController<R = ArrayBufferView> {
 declare class ReadableByteStreamController<R = ArrayBufferView> {
     constructor(stream: ReadableStream<R>, underlyingSource: ReadableStreamSource<R>, highWaterMark: number);
 
-    byobRequest: ReadableStreamBYOBRequest<R>;
-    desiredSize: number;
+    readonly byobRequest: ReadableStreamBYOBRequest<R>;
+    readonly desiredSize: number;
 
     close(): void;
     enqueue(chunk: R): number;
@@ -94,7 +94,7 @@ declare class ReadableByteStreamController<R = ArrayBufferView> {
 declare class ReadableStreamBYOBRequest<R = ArrayBufferView> {
     constructor(controller: ReadableByteStreamController<R>, view: R);
 
-    view: R;
+    readonly view: R;
 
     respond(bytesWritten: number): void;
     respondWithNewView(view: R): void;
@@ -110,7 +110,7 @@ interface WritableStreamSink<W = ArrayBufferView> {
 declare class WritableStream<W = ArrayBufferView> {
     constructor(underlyingSink?: WritableStreamSink<W>, strategy?: QueuingStrategy<W>);
 
-    locked: boolean;
+    readonly locked: boolean;
 
     abort(reason: string): Promise<void>;
     getWriter(): WritableStreamDefaultWriter<W>;
@@ -119,9 +119,9 @@ declare class WritableStream<W = ArrayBufferView> {
 declare class WritableStreamDefaultWriter<W = ArrayBufferView> {
     constructor(stream: WritableStream<W>);
 
-    closed: Promise<void>;
-    desiredSize: number | null;
-    ready: Promise<void>;
+    readonly closed: Promise<void>;
+    readonly desiredSize: number | null;
+    readonly ready: Promise<void>;
 
     abort(reason: string): Promise<void>;
     close(): Promise<void>;

From 4dfa74f147994c0684eea621e10cb422012677d6 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 22:05:21 +0200
Subject: [PATCH 080/141] pipeTo requires a compatible WritableStream

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index 45ff8fe7db..b6d6295b1e 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -46,7 +46,7 @@ declare class ReadableStream<R = ArrayBufferView> {
     getReader(): ReadableStreamDefaultReader<R>;
     getReader({ mode }: { mode: "byob" }): ReadableStreamBYOBReader<R>;
     pipeThrough<T extends ReadableStream<any>>({ writable, readable }: WritableReadablePair<WritableStream<R>, T>, options?: PipeOptions): T;
-    pipeTo(dest: WritableStream, options?: PipeOptions): Promise<void>;
+    pipeTo(dest: WritableStream<R>, options?: PipeOptions): Promise<void>;
     tee(): [ReadableStream<R>, ReadableStream<R>];
 }
 

From a0d88f531502321cbad4218fc443a0c1267abd8f Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 21:31:55 +0200
Subject: [PATCH 081/141] Argument for cancel and abort is any

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index b6d6295b1e..ae84bf1f7c 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -8,13 +8,13 @@
 export interface ReadableStreamSource<R = ArrayBufferView> {
     start?(controller: ReadableStreamDefaultController<R>): void | Promise<void>;
     pull?(controller: ReadableStreamDefaultController<R>): void | Promise<void>;
-    cancel?(reason: string): void | Promise<void>;
+    cancel?(reason: any): void | Promise<void>;
 }
 
 export interface ReadableByteStreamSource<R = ArrayBufferView> {
     start?(controller: ReadableByteStreamController<R>): void | Promise<void>;
     pull?(controller: ReadableByteStreamController<R>): void | Promise<void>;
-    cancel?(reason: string): void | Promise<void>;
+    cancel?(reason: any): void | Promise<void>;
 
     type: "bytes";
     autoAllocateChunkSize?: number;
@@ -42,7 +42,7 @@ declare class ReadableStream<R = ArrayBufferView> {
 
     readonly locked: boolean;
 
-    cancel(reason: string): Promise<void>;
+    cancel(reason: any): Promise<void>;
     getReader(): ReadableStreamDefaultReader<R>;
     getReader({ mode }: { mode: "byob" }): ReadableStreamBYOBReader<R>;
     pipeThrough<T extends ReadableStream<any>>({ writable, readable }: WritableReadablePair<WritableStream<R>, T>, options?: PipeOptions): T;
@@ -55,7 +55,7 @@ declare class ReadableStreamDefaultReader<R = ArrayBufferView> {
 
     readonly closed: Promise<void>;
 
-    cancel(reason: string): Promise<void>;
+    cancel(reason: any): Promise<void>;
     read(): Promise<IteratorResult<R>>;
     releaseLock(): void;
 }
@@ -65,7 +65,7 @@ declare class ReadableStreamBYOBReader<R = ArrayBufferView> {
 
     readonly closed: Promise<void>;
 
-    cancel(reason: string): Promise<void>;
+    cancel(reason: any): Promise<void>;
     read(view: R): Promise<IteratorResult<R>>;
     releaseLock(): void;
 }
@@ -104,7 +104,7 @@ interface WritableStreamSink<W = ArrayBufferView> {
     start?(controller: WritableStreamDefaultController<W>): void | Promise<void>;
     write?(chunk: W, controller?: WritableStreamDefaultController<W>): any;
     close?(controller: WritableStreamDefaultController<W>): void | Promise<void>;
-    abort?(reason: string): void | Promise<void>;
+    abort?(reason: any): void | Promise<void>;
 }
 
 declare class WritableStream<W = ArrayBufferView> {
@@ -112,7 +112,7 @@ declare class WritableStream<W = ArrayBufferView> {
 
     readonly locked: boolean;
 
-    abort(reason: string): Promise<void>;
+    abort(reason: any): Promise<void>;
     getWriter(): WritableStreamDefaultWriter<W>;
 }
 
@@ -123,7 +123,7 @@ declare class WritableStreamDefaultWriter<W = ArrayBufferView> {
     readonly desiredSize: number | null;
     readonly ready: Promise<void>;
 
-    abort(reason: string): Promise<void>;
+    abort(reason: any): Promise<void>;
     close(): Promise<void>;
     releaseLock(): void;
     write(chunk: W): Promise<void>;

From 22cdb9adcf5cbe6fadeb3b590795e6d8bfac7c33 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 22:10:20 +0200
Subject: [PATCH 082/141] enqueue returns void

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index ae84bf1f7c..ea96d6602e 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -76,7 +76,7 @@ declare class ReadableStreamDefaultController<R = ArrayBufferView> {
     readonly desiredSize: number;
 
     close(): void;
-    enqueue(chunk: R): number;
+    enqueue(chunk: R): void;
     error(e: any): void;
 }
 
@@ -87,7 +87,7 @@ declare class ReadableByteStreamController<R = ArrayBufferView> {
     readonly desiredSize: number;
 
     close(): void;
-    enqueue(chunk: R): number;
+    enqueue(chunk: R): void;
     error(e: any): void;
 }
 

From 488f1322916bcedb02c0eba54040a14049ebf754 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 22:14:20 +0200
Subject: [PATCH 083/141] Controllers and BYOB requests are not constructable

---
 types/whatwg-streams/index.d.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index ea96d6602e..1625d2bd25 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -71,8 +71,6 @@ declare class ReadableStreamBYOBReader<R = ArrayBufferView> {
 }
 
 declare class ReadableStreamDefaultController<R = ArrayBufferView> {
-    constructor(stream: ReadableStream, underlyingSource: ReadableStreamSource<R>, size: number, highWaterMark: number);
-
     readonly desiredSize: number;
 
     close(): void;
@@ -81,8 +79,6 @@ declare class ReadableStreamDefaultController<R = ArrayBufferView> {
 }
 
 declare class ReadableByteStreamController<R = ArrayBufferView> {
-    constructor(stream: ReadableStream<R>, underlyingSource: ReadableStreamSource<R>, highWaterMark: number);
-
     readonly byobRequest: ReadableStreamBYOBRequest<R>;
     readonly desiredSize: number;
 
@@ -92,8 +88,6 @@ declare class ReadableByteStreamController<R = ArrayBufferView> {
 }
 
 declare class ReadableStreamBYOBRequest<R = ArrayBufferView> {
-    constructor(controller: ReadableByteStreamController<R>, view: R);
-
     readonly view: R;
 
     respond(bytesWritten: number): void;
@@ -130,8 +124,6 @@ declare class WritableStreamDefaultWriter<W = ArrayBufferView> {
 }
 
 declare class WritableStreamDefaultController<W = ArrayBufferView> {
-    constructor(stream: WritableStream<W>, underlyingSink: WritableStreamSink<W>, size: number, highWaterMark: number);
-
     error(e: any): void;
 }
 

From 5cd33097549ab3316c2391e8eda037451bba7b80 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 22:03:13 +0200
Subject: [PATCH 084/141] read accepts any ArrayBufferView

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index 1625d2bd25..0c09acb9a0 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -61,12 +61,12 @@ declare class ReadableStreamDefaultReader<R = ArrayBufferView> {
 }
 
 declare class ReadableStreamBYOBReader<R = ArrayBufferView> {
-    constructor(stream: ReadableStream);
+    constructor(stream: ReadableStream<R>);
 
     readonly closed: Promise<void>;
 
     cancel(reason: any): Promise<void>;
-    read(view: R): Promise<IteratorResult<R>>;
+    read<T extends ArrayBufferView>(view: T): Promise<IteratorResult<T>>;
     releaseLock(): void;
 }
 

From 8de22e3b5ce658e437f3464c60581d9fab471c2f Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 22:16:31 +0200
Subject: [PATCH 085/141] respondWithNewView accepts any ArrayBufferView

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index 0c09acb9a0..e2487d438d 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -91,7 +91,7 @@ declare class ReadableStreamBYOBRequest<R = ArrayBufferView> {
     readonly view: R;
 
     respond(bytesWritten: number): void;
-    respondWithNewView(view: R): void;
+    respondWithNewView(view: ArrayBufferView): void;
 }
 
 interface WritableStreamSink<W = ArrayBufferView> {

From fa4578fa74c413cf5cd10398cd6f5c4be323da80 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Thu, 7 Jun 2018 22:21:40 +0200
Subject: [PATCH 086/141] desiredSize is null when stream is errored

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index e2487d438d..cadcf346ca 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -71,7 +71,7 @@ declare class ReadableStreamBYOBReader<R = ArrayBufferView> {
 }
 
 declare class ReadableStreamDefaultController<R = ArrayBufferView> {
-    readonly desiredSize: number;
+    readonly desiredSize: number | null;
 
     close(): void;
     enqueue(chunk: R): void;
@@ -80,7 +80,7 @@ declare class ReadableStreamDefaultController<R = ArrayBufferView> {
 
 declare class ReadableByteStreamController<R = ArrayBufferView> {
     readonly byobRequest: ReadableStreamBYOBRequest<R>;
-    readonly desiredSize: number;
+    readonly desiredSize: number | null;
 
     close(): void;
     enqueue(chunk: R): void;
@@ -157,5 +157,5 @@ declare class TransformStreamDefaultController<R> {
     error(reason: any): void;
     terminate(): void;
 
-    readonly desiredSize: number;
+    readonly desiredSize: number | null;
 }
diff --git a/types/whatwg-streams/whatwg-streams-tests.ts b/types/whatwg-streams/whatwg-streams-tests.ts
index 56246e0d97..c6e83a89d3 100644
--- a/types/whatwg-streams/whatwg-streams-tests.ts
+++ b/types/whatwg-streams/whatwg-streams-tests.ts
@@ -48,7 +48,7 @@ function makeReadableBackpressureSocketStream(host: string, port: number) {
             socket.ondata = (event: any) => {
                 controller.enqueue(event.data);
 
-                if (controller.desiredSize <= 0) {
+                if (controller.desiredSize! <= 0) {
                     // The internal queue is full, so propagate
                     // the backpressure signal to the underlying source.
                     socket.readStop();

From 04c52fd53836c16e87cff375944a240b30f0dcbd Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Sun, 10 Jun 2018 00:28:38 +0200
Subject: [PATCH 087/141] Sink.write can return void or a promise

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index cadcf346ca..c6d5ea893b 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -96,7 +96,7 @@ declare class ReadableStreamBYOBRequest<R = ArrayBufferView> {
 
 interface WritableStreamSink<W = ArrayBufferView> {
     start?(controller: WritableStreamDefaultController<W>): void | Promise<void>;
-    write?(chunk: W, controller?: WritableStreamDefaultController<W>): any;
+    write?(chunk: W, controller?: WritableStreamDefaultController<W>): void | Promise<void>;
     close?(controller: WritableStreamDefaultController<W>): void | Promise<void>;
     abort?(reason: any): void | Promise<void>;
 }

From fb1f24dd6b2af6d672c8f1cd113cecf43fb135c6 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Sun, 10 Jun 2018 00:30:43 +0200
Subject: [PATCH 088/141] Allow any promise result type for
 source/sink/transformer methods

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index c6d5ea893b..975151a74d 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -6,15 +6,15 @@
 // TypeScript Version: 2.3
 
 export interface ReadableStreamSource<R = ArrayBufferView> {
-    start?(controller: ReadableStreamDefaultController<R>): void | Promise<void>;
-    pull?(controller: ReadableStreamDefaultController<R>): void | Promise<void>;
-    cancel?(reason: any): void | Promise<void>;
+    start?(controller: ReadableStreamDefaultController<R>): void | Promise<any>;
+    pull?(controller: ReadableStreamDefaultController<R>): void | Promise<any>;
+    cancel?(reason: any): void | Promise<any>;
 }
 
 export interface ReadableByteStreamSource<R = ArrayBufferView> {
-    start?(controller: ReadableByteStreamController<R>): void | Promise<void>;
-    pull?(controller: ReadableByteStreamController<R>): void | Promise<void>;
-    cancel?(reason: any): void | Promise<void>;
+    start?(controller: ReadableByteStreamController<R>): void | Promise<any>;
+    pull?(controller: ReadableByteStreamController<R>): void | Promise<any>;
+    cancel?(reason: any): void | Promise<any>;
 
     type: "bytes";
     autoAllocateChunkSize?: number;
@@ -95,10 +95,10 @@ declare class ReadableStreamBYOBRequest<R = ArrayBufferView> {
 }
 
 interface WritableStreamSink<W = ArrayBufferView> {
-    start?(controller: WritableStreamDefaultController<W>): void | Promise<void>;
-    write?(chunk: W, controller?: WritableStreamDefaultController<W>): void | Promise<void>;
-    close?(controller: WritableStreamDefaultController<W>): void | Promise<void>;
-    abort?(reason: any): void | Promise<void>;
+    start?(controller: WritableStreamDefaultController<W>): void | Promise<any>;
+    write?(chunk: W, controller?: WritableStreamDefaultController<W>): void | Promise<any>;
+    close?(controller: WritableStreamDefaultController<W>): void | Promise<any>;
+    abort?(reason: any): void | Promise<any>;
 }
 
 declare class WritableStream<W = ArrayBufferView> {
@@ -140,9 +140,9 @@ declare class CountQueuingStrategy {
 }
 
 declare interface TransformStreamTransformer<R, W> {
-    start?(controller: TransformStreamDefaultController<R>): void | Promise<void>;
-    transform?(chunk: W, controller: TransformStreamDefaultController<R>): void | Promise<void>;
-    flush?(controller: TransformStreamDefaultController<R>): void | Promise<void>;
+    start?(controller: TransformStreamDefaultController<R>): void | Promise<any>;
+    transform?(chunk: W, controller: TransformStreamDefaultController<R>): void | Promise<any>;
+    flush?(controller: TransformStreamDefaultController<R>): void | Promise<any>;
 }
 
 declare class TransformStream<R, W> implements WritableReadablePair<WritableStream<W>, ReadableStream<R>> {

From 647b4e2b5cdd287b1376eca33fd1b3f12be95582 Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Sun, 10 Jun 2018 00:35:32 +0200
Subject: [PATCH 089/141] Export transformer interface

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index 975151a74d..22e9445bca 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -139,7 +139,7 @@ declare class CountQueuingStrategy {
     size(): 1;
 }
 
-declare interface TransformStreamTransformer<R, W> {
+export interface TransformStreamTransformer<R, W> {
     start?(controller: TransformStreamDefaultController<R>): void | Promise<any>;
     transform?(chunk: W, controller: TransformStreamDefaultController<R>): void | Promise<any>;
     flush?(controller: TransformStreamDefaultController<R>): void | Promise<any>;

From 90e7a161f5425490812edf2899db28b285dddfca Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Sun, 10 Jun 2018 00:30:52 +0200
Subject: [PATCH 090/141] Update contributors

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

diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index 22e9445bca..8b61b9d657 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/whatwg/streams
 // Definitions by: Kagami Sascha Rosylight <https://github.com/saschanaz>
 //                 Konstantin Simon Maria Möllers <https://github.com/ksm2>
+//                 Mattias Buelens <https://github.com/MattiasBuelens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 5d209bbbcede0582a157ee4a26b09af671409bfc Mon Sep 17 00:00:00 2001
From: khanhas <xuankhanh963@gmail.com>
Date: Sun, 10 Jun 2018 10:45:22 +0700
Subject: [PATCH 091/141] Added x and y for Area.Text

https://github.com/kusti8/proton-native/commit/178c0903b3d7bdd9a8116a771006651a817c6d02
---
 types/proton-native/index.d.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/types/proton-native/index.d.ts b/types/proton-native/index.d.ts
index 23c980fd73..0cfb0e5798 100644
--- a/types/proton-native/index.d.ts
+++ b/types/proton-native/index.d.ts
@@ -214,6 +214,14 @@ export interface AreaTextProps extends AreaBaseProps {
      * A color string | 'spelling' | 'grammar' | 'auxiliary'
      */
     textUnderlineColor?: 'spelling' | 'grammar' | 'auxiliary' | string;
+    /**
+     * The x coordinate of the text's top left corner. (Only in a top level text component.)
+     */
+    x?: number | string;
+    /**
+     * The y coordinate of the text's top left corner. (Only in a top level text component.)
+     */
+    y?: number | string;
 }
 
 export class AreaText extends React.Component<AreaTextProps> { }

From a81f093aaa06b1bb2147c2b1ad9d3626d1da4ae9 Mon Sep 17 00:00:00 2001
From: Wolf Walter <wwalter@solvis.de>
Date: Sun, 10 Jun 2018 09:45:16 +0200
Subject: [PATCH 092/141] [serialport] added readonly properties

https://node-serialport.github.io/node-serialport/SerialPort.html
---
 types/serialport/index.d.ts          | 5 +++++
 types/serialport/serialport-tests.ts | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/types/serialport/index.d.ts b/types/serialport/index.d.ts
index 84b5790fd4..b0a374efeb 100644
--- a/types/serialport/index.d.ts
+++ b/types/serialport/index.d.ts
@@ -12,6 +12,11 @@ declare class SerialPort extends Stream.Duplex {
 	constructor(path: string, callback?: SerialPort.ErrorCallback);
 	constructor(path: string, options?: SerialPort.OpenOptions, callback?: SerialPort.ErrorCallback);
 
+	readonly baudRate: number;
+	readonly binding: SerialPort.BaseBinding;
+	readonly isOpen: boolean;
+	readonly path: string;
+
 	open(callback?: SerialPort.ErrorCallback): void;
 	update(options: SerialPort.UpdateOptions, callback?: SerialPort.ErrorCallback): void;
 
diff --git a/types/serialport/serialport-tests.ts b/types/serialport/serialport-tests.ts
index 9ff1daa26e..7b540c5e12 100644
--- a/types/serialport/serialport-tests.ts
+++ b/types/serialport/serialport-tests.ts
@@ -117,3 +117,12 @@ function test_parsers() {
     port.pipe(ReadyParser);
     port.pipe(RegexParser);
 }
+
+function test_properties() {
+    const port = new SerialPort('');
+
+    const baudRate: number = port.baudRate;
+    const binding: SerialPort.BaseBinding = port.binding;
+    const isOpen: boolean = port.isOpen;
+    const path: string = port.path;
+}

From 3ef4d930b86735f394aacd408bf125fbcee99a9f Mon Sep 17 00:00:00 2001
From: Artur <swartur2012@gmail.com>
Date: Sun, 10 Jun 2018 11:43:56 +0300
Subject: [PATCH 093/141] Update index.d.ts

According to the official documentation

> Like other classes in D3, layouts follow the method chaining pattern where setter methods return the layout itself, allowing multiple setters to be invoked in a concise statement.

And d3.layout.treemap.sticky specifically https://github.com/d3/d3-3.x-api-reference/blob/master/Treemap-Layout.md#sticky  should return Treemap<T>.

This file should comply with the actual API, why it is not?

Submiting this MR to your consideration
---
 types/d3/v3/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/d3/v3/index.d.ts b/types/d3/v3/index.d.ts
index 9a2f9ae34a..9f32212f6b 100644
--- a/types/d3/v3/index.d.ts
+++ b/types/d3/v3/index.d.ts
@@ -3277,7 +3277,7 @@ declare namespace d3 {
             round(round: boolean): Treemap<T>;
 
             sticky(): boolean;
-            sticky(sticky: boolean): boolean;
+            sticky(sticky: boolean): Treemap<T>;
 
             mode(): string;
             mode(mode: "squarify"): Treemap<T>;

From b29b482610f4b78669691fa161bd59e411d555c1 Mon Sep 17 00:00:00 2001
From: Artur-A <artur.a@highrobotics.com>
Date: Sun, 10 Jun 2018 14:18:40 +0300
Subject: [PATCH 094/141] Updated Shapes, Phrases and overall structure

---
 types/react-dates/index.d.ts            | 567 ++++++++++++++----------
 types/react-dates/react-dates-tests.tsx |   9 +-
 2 files changed, 349 insertions(+), 227 deletions(-)
 mode change 100644 => 100755 types/react-dates/index.d.ts
 mode change 100644 => 100755 types/react-dates/react-dates-tests.tsx

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
old mode 100644
new mode 100755
index eefdbc9ead..f69a3f0869
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -1,12 +1,14 @@
-// Type definitions for react-dates v16.0.0
+// Type definitions for react-dates v16.7.0
 // Project: https://github.com/airbnb/react-dates
-// Definitions by: Artur Ampilogov <https://github.com/Artur-A> 
+// Definitions by: Artur Ampilogov <https://github.com/ArturAmpilogov> 
 //                 Nathan Holland <https://github.com/NathanNZ>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-import * as React from "react";
-import * as moment from "moment";
+// Required fields are made according to 'minimum REQUIRED setup' in https://github.com/airbnb/react-dates/blob/master/README.md
+ 
+import * as React from 'react';
+import * as moment from 'moment';
 
 export = ReactDates;
 
@@ -18,42 +20,273 @@ declare namespace momentPropTypes {
 
 
 declare namespace ReactDates {
+    // SHAPES    
+    //
+    // shapes/AnchorDirectionShape.js
     type AnchorDirectionShape = 'left' | 'right';
-    type FocusedInputShape = 'startDate' | 'endDate';
-    type OrientationShape = 'horizontal' | 'vertical';
-    type ScrollableOrientationShape = 'horizontal' | 'vertical' | 'verticalScrollable';
+
+    // shapes/CalendarInfoPositionShape.js
     type CalendarInfoPositionShape = 'top' | 'bottom' | 'before' | 'after';
 
-    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/defaultPhrases.js
-    type SingleDatePickerPhrases  = {
-        closeDatePicker: string,
-        clearDate: string,
-        jumpToPrevMonth: string,
-        jumpToNextMonth: string,
-        keyboardShortcuts: string,
-        showKeyboardShortcutsPanel: string,
-        hideKeyboardShortcutsPanel: string,
-        openThisPanel: string,
-        enterKey: string,
-        leftArrowRightArrow: string,
-        upArrowDownArrow: string,
-        pageUpPageDown: string,
-        homeEnd: string,
-        escape: string,
-        questionMark: string,
-        selectFocusedDate: string,
-        moveFocusByOneDay: string,
-        moveFocusByOneWeek: string,
-        moveFocusByOneMonth: string,
-        moveFocustoStartAndEndOfWeek: string,
-        returnFocusToInput: string,
-        keyboardNavigationInstructions: string,
-        chooseAvailableDate: (date: string) => string,
-        dateIsUnavailable: (date: string) => string,
+    
+    // shapes/DateRangePickerShape.js
+    interface DateRangePickerShape {
+        // required props for a functional interactive DateRangePicker
+        startDate: momentPropTypes.momentObj | null,
+        startDateId: string,
+        endDate: momentPropTypes.momentObj | null,
+        endDateId: string,
+        focusedInput: FocusedInputShape | null,
+
+        onDatesChange: (arg: {
+            startDate: momentPropTypes.momentObj | null,
+            endDate: momentPropTypes.momentObj | null
+        }) => void,
+        onFocusChange: (arg: FocusedInputShape | null) => void,
+        
+        onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
+
+        // input related props
+        startDatePlaceholderText?: string,
+        endDatePlaceholderText?: string,
+        disabled?: boolean,
+        required?: boolean,
+        readOnly?: boolean,
+        screenReaderInputMessage?: string,
+        showClearDates?: boolean,
+        showDefaultInputIcon?: boolean,
+        customInputIcon?: string | JSX.Element,
+        customArrowIcon?: string | JSX.Element,
+        customCloseIcon?: string | JSX.Element,
+        noBorder?: boolean,
+        block?: boolean,
+        small?: boolean,
+        regular?: boolean,
+        keepFocusOnInput?: boolean,
+
+        // calendar presentation and interaction related props
+        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        orientation?: OrientationShape,
+        anchorDirection?: AnchorDirectionShape,
+        openDirection?: OpenDirectionShape,
+        horizontalMargin?: number,
+        withPortal?: boolean,
+        withFullScreenPortal?: boolean,
+        appendToBody?: boolean,
+        disableScroll?: boolean,
+        daySize?: number,
+        isRTL?: boolean,
+        firstDayOfWeek?: DayOfWeekShape,
+        initialVisibleMonth?: () => momentPropTypes.momentObj,
+        numberOfMonths?: number,
+        keepOpenOnDateSelect?: boolean,
+        reopenPickerOnClearDates?: boolean,
+        renderCalendarInfo?: () => (string | JSX.Element),
+        calendarInfoPosition?: CalendarInfoPositionShape,
+        hideKeyboardShortcutsPanel?: boolean,
+        verticalHeight?: number,
+        transitionDuration?: number,
+        verticalSpacing?: number,
+
+        // navigation related props
+        navPrev?: string | JSX.Element,
+        navNext?: string | JSX.Element,
+        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+
+        // day presentation and interaction related props
+        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        minimumNights?: number,
+        enableOutsideDays?: boolean,
+        isDayBlocked?: (day: any) => boolean,
+        isOutsideRange?: (day: any) => boolean,
+        isDayHighlighted?: (day: any) => boolean,
+
+
+        // internationalization props
+        displayFormat?: (string | (() => string)),
+        monthFormat?: string,
+        weekDayFormat?: string,
+        phrases?: DateRangePickerPhrases,
+        dayAriaLabelFormat?: string
+    }
+
+    // shapes/DayOfWeekShape.js
+    type DayOfWeekShape = 0 | 1 | 2 | 3 | 4 | 5 | 6;
+
+    // shapes/DisabledShape.js
+    type DisabledShape = boolean | 'startDate' | 'endDate';
+
+    // shapes/FocusedInputShape.js
+    type FocusedInputShape = 'startDate' | 'endDate';
+
+    // shape/IconPositionShape.js
+    type IconPositionShape = 'before' | 'after';
+
+    // type/OpenDirectionShape.js
+    type OpenDirectionShape = 'down' | 'up';
+
+    // shpae/OrientationShape.js
+    type OrientationShape = 'horizontal' | 'vertical';
+
+    // shape/ScrollableOrientationShape.js
+    type ScrollableOrientationShape = 'horizontal' | 'vertical' | 'verticalScrollable';
+
+
+    // shapes/SingleDatePickerShape.js
+    interface SingleDatePickerShape {
+        id: string,
+
+        // required props for a functional interactive SingleDatePicker
+        date: momentPropTypes.momentObj | null,
+        focused: boolean,
+        
+        onDateChange: (date: momentPropTypes.momentObj | null) => void,
+        onFocusChange: (arg: { focused: boolean | null }) => void,
+        
+        // input related props
+        placeholder?: string,
+        disabled?: boolean,
+        required?: boolean,
+        readOnly?: boolean,
+        screenReaderInputMessage?: string,
+        showClearDate?: boolean,
+        customCloseIcon?: string | JSX.Element,
+        showDefaultInputIcon?: boolean,
+        inputIconPosition?: IconPositionShape,
+        customInputIcon?: string | JSX.Element,
+        noBorder?: boolean,
+        block?: boolean,
+        small?: boolean,
+        regular?: boolean,
+        verticalSpacing?: number,
+        keepFocusOnInput?: boolean,
+
+        // calendar presentation and interaction related props
+        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        orientation?: OrientationShape,
+        anchorDirection?: AnchorDirectionShape,
+        horizontalMargin?: number,
+        withPortal?: boolean,
+        withFullScreenPortal?: boolean,
+        appendToBody?: boolean,
+        disableScroll?: boolean,
+        initialVisibleMonth?: () => momentPropTypes.momentObj,
+        firstDayOfWeek?: DayOfWeekShape,
+        numberOfMonths?: number,
+        keepOpenOnDateSelect?: boolean,
+        reopenPickerOnClearDates?: boolean,
+        renderCalendarInfo?: () => (string | JSX.Element),
+        calendarInfoPosition?: CalendarInfoPositionShape,
+        hideKeyboardShortcutsPanel?: boolean,
+        daySize?: number,
+        isRTL?: boolean,
+        verticalHeight?: number | null,
+        transitionDuration?: number,
+
+        // navigation related props
+        navPrev?: string | JSX.Element,
+        navNext?: string | JSX.Element,
+        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+        onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
+
+        // day presentation and interaction related props
+        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        enableOutsideDays?: boolean,
+        isDayBlocked?: (day: any) => boolean,
+        isOutsideRange?: (day: any) => boolean,
+        isDayHighlighted?: (day: any) => boolean,
+
+        // internationalization props
+        displayFormat?: (string | (() => string)),
+        monthFormat?: string,
+        weekDayFormat?: string,
+        phrases?: SingleDatePickerPhrases,
+        dayAriaLabelFormat?: string,
+    }
+
+    // PHRASES
+    //
+    // defaultPhrases.js
+    type DateRangePickerPhrases = {
+        calendarLabel?: string,
+        closeDatePicker?: string,
+        clearDates?: string,
+        focusStartDate?: string,
+        jumpToPrevMonth?: string,
+        jumpToNextMonth?: string,
+        keyboardShortcuts?: string,
+        showKeyboardShortcutsPanel?: string,
+        hideKeyboardShortcutsPanel?: string,
+        openThisPanel?: string,
+        enterKey?: string,
+        leftArrowRightArrow?: string,
+        upArrowDownArrow?: string,
+        pageUpPageDown?: string,
+        homeEnd?: string,
+        escape?: string,
+        questionMark?: string,
+        selectFocusedDate?: string,
+        moveFocusByOneDay?: string,
+        moveFocusByOneWeek?: string,
+        moveFocusByOneMonth?: string,
+        moveFocustoStartAndEndOfWeek?: string,
+        returnFocusToInput?: string,
+        keyboardNavigationInstructions?: string,
+        chooseAvailableStartDate?: (date: string) => string,
+        chooseAvailableEndDate?: (date: string) => string,
+        dateIsUnavailable?: (date: string) => string,
+        dateIsSelected?: (date: string) => string
     };
 
-    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/defaultPhrases.js
-    type DateRangePickerPhrases = {
+    // defaultPhrases.js
+    type DateRangePickerInputPhrases = {
+        focusStartDate?: string,
+        clearDates?: string,
+        keyboardNavigationInstructions?: string,
+    }
+
+    // defaultPhrases.js
+    type SingleDatePickerPhrases  = {
+        calendarLabel?: string,
+        closeDatePicker?: string,
+        clearDate?: string,
+        jumpToPrevMonth?: string,
+        jumpToNextMonth?: string,
+        keyboardShortcuts?: string,
+        showKeyboardShortcutsPanel?: string,
+        hideKeyboardShortcutsPanel?: string,
+        openThisPanel?: string,
+        enterKey?: string,
+        leftArrowRightArrow?: string,
+        upArrowDownArrow?: string,
+        pageUpPageDown?: string,
+        homeEnd?: string,
+        escape?: string,
+        questionMark?: string,
+        selectFocusedDate?: string,
+        moveFocusByOneDay?: string,
+        moveFocusByOneWeek?: string,
+        moveFocusByOneMonth?: string,
+        moveFocustoStartAndEndOfWeek?: string,
+        returnFocusToInput?: string,
+        keyboardNavigationInstructions?: string,
+        chooseAvailableDate?: (date: string) => string,
+        dateIsUnavailable?: (date: string) => string,
+        dateIsSelected?: (date: string) => string,
+    };
+
+    // defaultPhrases.js
+    type SingleDatePickerInputPhrases = {
+        clearDate?: string,
+        keyboardNavigationInstructions?: string,
+    }
+
+    // defaultPhrases.js
+    type DayPickerPhrases = {
         calendarLabel?: string,
         jumpToPrevMonth?: string,
         jumpToNextMonth?: string,
@@ -78,156 +311,52 @@ declare namespace ReactDates {
         chooseAvailableEndDate?: (date: string) => string,
         chooseAvailableDate?: (date: string) => string,
         dateIsUnavailable?: (date: string) => string,
-        dateIsSelected?: (date: string) => string
+        dateIsSelected?: (date: string) => string,
     };
-    
-    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/shapes/DateRangePickerShape.js
-    interface DateRangePickerShape {
-        // REQUIRED props
-        startDate: momentPropTypes.momentObj | null,
-        endDate: momentPropTypes.momentObj | null,
-        onDatesChange: (arg: {
-            startDate: momentPropTypes.momentObj | null,
-            endDate: momentPropTypes.momentObj | null
-        }
-        ) => void,
-        focusedInput: FocusedInputShape | null,
-        onFocusChange: (arg: FocusedInputShape | null) => void,
 
-        // input related props
-        startDateId?: string,
-        startDatePlaceholderText?: string,
-        endDateId?: string,
-        endDatePlaceholderText?: string,
-        disabled?: boolean,
-        keepFocusOnInput?: boolean,
-        required?: boolean,
-        readOnly?: boolean,
-        screenReaderInputMessage?: string,
-        showClearDates?: boolean,
-        showDefaultInputIcon?: boolean,
-        customInputIcon?: string | JSX.Element,
-        customArrowIcon?: string | JSX.Element,
-        customCloseIcon?: string | JSX.Element,
-        noBorder?: boolean,
-        block?: boolean,
+    // defaultPhrases.js
+    type DayPickerKeyboardShortcutsPhrases = {
+        keyboardShortcuts?: string,
+        showKeyboardShortcutsPanel?: string,
+        hideKeyboardShortcutsPanel?: string,
+        openThisPanel?: string,
+        enterKey?: string,
+        leftArrowRightArrow?: string,
+        upArrowDownArrow?: string,
+        pageUpPageDown?: string,
+        homeEnd?: string,
+        escape?: string,
+        questionMark?: string,
+        selectFocusedDate?: string,
+        moveFocusByOneDay?: string,
+        moveFocusByOneWeek?: string,
+        moveFocusByOneMonth?: string,
+        moveFocustoStartAndEndOfWeek?: string,
+        returnFocusToInput?: string,
+    };
 
-        // calendar presentation and interaction related props
-        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
-        orientation?: OrientationShape,
-        anchorDirection?: AnchorDirectionShape,
-        horizontalMargin?: number,
-        withPortal?: boolean,
-        withFullScreenPortal?: boolean,
-        initialVisibleMonth?: () => momentPropTypes.momentObj,
-        firstDayOfWeek?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
-        numberOfMonths?: number,
-        keepOpenOnDateSelect?: boolean,
-        reopenPickerOnClearDates?: boolean,
-        renderCalendarInfo?: () => (string | JSX.Element),
-        hideKeyboardShortcutsPanel?: boolean,
-        daySize?: number,
-        isRTL?: boolean,
+    // defaultPhrases.js
+    type DayPickerNavigationPhrases = {
+        jumpToPrevMonth?: string,
+        jumpToNextMonth?: string,
+    };
+      
+    // defaultPhrases.js
+    type CalendarDayPhrases = {
+        chooseAvailableDate: (date: string) => string,
+        dateIsUnavailable: (date: string) => string,
+        dateIsSelected: (date: string) => string,
+    };
 
-        // navigation related props
-        navPrev?: string | JSX.Element,
-        navNext?: string | JSX.Element,
-        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
-        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
-        onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
-        transitionDuration?: number,
-
-        // day presentation and interaction related props
-        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
-        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
-        minimumNights?: number,
-        enableOutsideDays?: boolean,
-        isDayBlocked?: (day: any) => boolean,
-        isOutsideRange?: (day: any) => boolean,
-        isDayHighlighted?: (day: any) => boolean,
-
-
-        // internationalization props
-        displayFormat?: (string | (() => string)),
-        monthFormat?: string,
-        weekDayFormat?: string,
-        phrases?: DateRangePickerPhrases
-    }
+    // COMPONENTS
+    // 
+    // components/DateRangePicker.js
 
     type DateRangePicker = React.ClassicComponentClass<DateRangePickerShape>;
     var DateRangePicker: React.ClassicComponentClass<DateRangePickerShape>;
 
-    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/shapes/SingleDatePickerShape.js
-    interface SingleDatePickerShape {
-        // REQUIRED props
-        date: momentPropTypes.momentObj | null,
-        onDateChange: (date: momentPropTypes.momentObj | null) => void,
-        focused: boolean,
-        onFocusChange: (arg: { focused: boolean | null }) => void,
-
-        id: string,
-
-        // input related props
-        placeholder?: string,
-        disabled?: boolean,
-        required?: boolean,
-        readOnly?: boolean,
-        screenReaderInputMessage?: string,
-        showClearDate?: boolean,
-        customCloseIcon?: string | JSX.Element,
-        showDefaultInputIcon?: boolean,
-        customInputIcon?: string | JSX.Element,
-        noBorder?: boolean,
-        block?: boolean,
-        small?: boolean,
-        regular?: boolean,
-        keepFocusOnInput?: boolean,
-
-        // calendar presentation and interaction related props
-        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
-        orientation?: OrientationShape,
-        anchorDirection?: AnchorDirectionShape,
-        horizontalMargin?: number,
-        withPortal?: boolean,
-        withFullScreenPortal?: boolean,
-        initialVisibleMonth?: () => momentPropTypes.momentObj,
-        firstDayOfWeek?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
-        numberOfMonths?: number,
-        keepOpenOnDateSelect?: boolean,
-        reopenPickerOnClearDates?: boolean,
-        renderCalendarInfo?: () => (string | JSX.Element),
-        hideKeyboardShortcutsPanel?: boolean,
-        daySize?: number,
-        isRTL?: boolean,
-        verticalSpacing?: number,
-        verticalHeight?: number | null,
-
-        // navigation related props
-        navPrev?: string | JSX.Element,
-        navNext?: string | JSX.Element,
-        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
-        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
-        onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
-        transitionDuration?: number,
-
-        // day presentation and interaction related props
-        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
-        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
-        enableOutsideDays?: boolean,
-        isDayBlocked?: (day: any) => boolean,
-        isOutsideRange?: (day: any) => boolean,
-        isDayHighlighted?: (day: any) => boolean,
-
-        // internationalization props
-        displayFormat?: (string | (() => string)),
-        monthFormat?: string,
-        phrases?: SingleDatePickerPhrases
-    }
-    type SingleDatePicker = React.ClassicComponentClass<SingleDatePickerShape>;
-    var SingleDatePicker: React.ClassicComponentClass<SingleDatePickerShape>;
-
-    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/components/DayPickerRangeController.jsx
-    interface DayPickerRangeControllerShape {
+    // components/DayPickerRangeController.jsx
+    interface DayPickerRangeControllerShape extends DayPickerShape{
         // REQUIRED props
         startDate: momentPropTypes.momentObj | null,
         endDate: momentPropTypes.momentObj | null,
@@ -236,62 +365,27 @@ declare namespace ReactDates {
             endDate: momentPropTypes.momentObj | null
         }
         ) => void,
-        focusedInput: FocusedInputShape | null,
+        focusedInput: FocusedInputShape,
         onFocusChange: (arg: FocusedInputShape | null) => void,
 
-        // calendar presentation and interaction related props
-        enableOutsideDays?: boolean,
-        numberOfMonths?: number,
-        orientation?: ScrollableOrientationShape,
-        withPortal?: boolean,
-        initialVisibleMonth?: () => momentPropTypes.momentObj,
-        renderCalendarInfo?: () => (string | JSX.Element),
-        onOutsideClick?: (e: any) => void,
+        startDateOffset?: (day: any) => any,
+        endDateOffset?: (day: any) => any,
+
+        onClose?: (final: { startDate: momentPropTypes.momentObj, endDate: momentPropTypes.momentObj }) => void,
+
         keepOpenOnDateSelect?: boolean,
-        hideKeyboardShortcutsPanel?: boolean;
-        noBorder?: boolean,
-        verticalBorderSpacing?: number,
-        firstDayOfWeek? : 0 | 1 | 2 | 3 | 4 | 5 | 6,
-
-        // navigation related props
-        navPrev?: string | JSX.Element,
-        navNext?: string | JSX.Element,
-        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
-        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
-        transitionDuration?: number,
-
-        // day presentation and interaction related props
-        daySize?: number,
-        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
-        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         minimumNights?: number,
+        disabled?: DisabledShape,
         isOutsideRange?: (day: any) => boolean,
         isDayBlocked?: (day: any) => boolean,
         isDayHighlighted?: (day: any) => boolean,
-
-        // internationalization props
-        monthFormat?: string,
-        phrases?: DateRangePickerPhrases
     }
 
     type DayPickerRangeController = React.ClassicComponentClass<DayPickerRangeControllerShape>;
     var DayPickerRangeController: React.ClassicComponentClass<DayPickerRangeControllerShape>;
 
-    //https://github.com/airbnb/react-dates/blob/97bf16e72dbf5ce88f0181c49212080061a83f69/src/components/DayPickerSingleDateController.jsx
-    interface DayPickerSingleDateControllerShape {
-        date: momentPropTypes.momentObj | null,
-        onDateChange: (date: momentPropTypes.momentObj | null) => void,
-        focused: boolean,
-
-        onFocusChange: (arg: { focused: boolean | null }) => void,
-        onClose?: (final: { date: momentPropTypes.momentObj }) => void,
-
-        keepOpenOnDateSelect?: boolean,
-        isOutsideRange?: (day: any) => boolean,
-        isDayBlocked?: (day: any) => boolean,
-        isDayHighlighted?: (day: any) => boolean,
-
-        // DayPicker props
+    // components/DayPickerShape.jsx
+    interface DayPickerShape {
         renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         enableOutsideDays?: boolean,
         numberOfMonths?: number,
@@ -327,20 +421,45 @@ declare namespace ReactDates {
         phrases?: SingleDatePickerPhrases,
         dayAriaLabelFormat?: string,
 
-        isRTL?: boolean,
+        isRTL?: boolean
+    }
 
+    // components/DayPickerSingleDateController.jsx
+    interface DayPickerSingleDateControllerShape extends DayPickerShape {
+        date: momentPropTypes.momentObj | null,
+        onDateChange: (date: momentPropTypes.momentObj | null) => void,
+        focused: boolean,
+        onFocusChange: (arg: { focused: boolean | null }) => void,
+
+        onClose?: (final: { date: momentPropTypes.momentObj }) => void,
+
+        keepOpenOnDateSelect?: boolean,
+        isOutsideRange?: (day: any) => boolean,
+        isDayBlocked?: (day: any) => boolean,
+        isDayHighlighted?: (day: any) => boolean,
     }
 
     type DayPickerSingleDateController = React.ClassicComponentClass<DayPickerSingleDateControllerShape>;
     var DayPickerSingleDateController: React.ClassicComponentClass<DayPickerSingleDateControllerShape>;
 
+    // components/SingleDatePicker.js
+    type SingleDatePicker = React.ClassicComponentClass<SingleDatePickerShape>;
+    var SingleDatePicker: React.ClassicComponentClass<SingleDatePickerShape>;
+
+    // UTILS
+    //
+    // utils/isInclusivelyAfterDay.js
     var isInclusivelyAfterDay: (a: moment.Moment, b: moment.Moment) => boolean;
+    // utils/isInclusivelyBeforeDay.js
     var isInclusivelyBeforeDay: (a: moment.Moment, b: moment.Moment) => boolean;
+    // utils/isNextDay.js
     var isNextDay: (a: moment.Moment, b: moment.Moment) => boolean;
+    // utils/isSameDay.js
     var isSameDay: (a: moment.Moment, b: moment.Moment) => boolean;
-
+    // utils/toISODateString.js
     var toISODateString: (date: moment.MomentInput, currentFormat: moment.MomentFormatSpecification) => string | null;
+    // utils/toLocalizedDateString.js
     var toLocalizedDateString: (date: moment.MomentInput, currentFormat: moment.MomentFormatSpecification) => string | null;
-
+    // utils/toMomentObject.js
     var toMomentObject: (dateString: moment.MomentInput, customFormat: moment.MomentFormatSpecification) => moment.Moment | null;
 }
diff --git a/types/react-dates/react-dates-tests.tsx b/types/react-dates/react-dates-tests.tsx
old mode 100644
new mode 100755
index 2d0aaae431..ad95f6aa03
--- a/types/react-dates/react-dates-tests.tsx
+++ b/types/react-dates/react-dates-tests.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
-import moment = require("moment");
+import * as React from 'react';
+import moment = require('moment');
 
 import {
         SingleDatePicker,
@@ -75,9 +75,11 @@ class DateRangePickerMinimumTest extends React.Component {
     render() {
         return <DateRangePicker
                     startDate={moment()}
+                    startDateId='startDateId'
                     endDate={moment()}
-                    onDatesChange={(arg)=> {}}
+                    endDateId='endDateId'
                     focusedInput="startDate"
+                    onDatesChange={(arg) => {}}
                     onFocusChange={(arg) => {}}
                      />
     }
@@ -122,6 +124,7 @@ class DateRangePickerFullTest extends React.Component {
                     orientation="horizontal"
                     monthFormat="MM"
                     renderDayContents={day => day.toString()}
+                    onClose={(final:any) =>{}}
                     />
     }
 }

From f3ec99dffb983cc8b9e0a7e446210c06e48d5ddd Mon Sep 17 00:00:00 2001
From: Igor Lino <igorlino@users.noreply.github.com>
Date: Sun, 10 Jun 2018 14:27:04 +0200
Subject: [PATCH 095/141] angular-local-storage: Improve main types visibility

Use the same export pattern as angular-ui-boostrap.
Its nearly the same, but in older typescript projects works its the only way to get those visible for importing.
---
 types/angular-local-storage/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/angular-local-storage/index.d.ts b/types/angular-local-storage/index.d.ts
index 76ab65b1b5..6e8c64416a 100644
--- a/types/angular-local-storage/index.d.ts
+++ b/types/angular-local-storage/index.d.ts
@@ -8,6 +8,10 @@
 
 import * as angular from 'angular';
 
+export type ILocalStorageServiceProvider = angular.local.storage.ILocalStorageServiceProvider;
+export type ILocalStorageService = angular.local.storage.ILocalStorageService;
+export type ICookie = angular.local.storage.ICookie;
+
 declare module 'angular' {
     export namespace local.storage {
         interface ILocalStorageServiceProvider extends angular.IServiceProvider {

From 40ccd7f6a9f4b4c5856137b1882ec5a437a1d44b Mon Sep 17 00:00:00 2001
From: Igor Lino <igorlino@users.noreply.github.com>
Date: Sun, 10 Jun 2018 14:30:23 +0200
Subject: [PATCH 096/141] angular-gettext: Improve main types visibility

Use the same export pattern as angular-ui-boostrap.
Its nearly the same, but in older typescript projects works its the only way to get those visible for importing.
---
 types/angular-gettext/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/angular-gettext/index.d.ts b/types/angular-gettext/index.d.ts
index 107d9e10e2..5b6eb1d90f 100644
--- a/types/angular-gettext/index.d.ts
+++ b/types/angular-gettext/index.d.ts
@@ -9,6 +9,7 @@
 
 import * as angular from 'angular';
 
+export type gettextCatalog = angular.gettext.gettextCatalog;
 
 declare module 'angular' {
   export namespace gettext {

From bfb9112bce25d33540973dafa45d17d2d82b2aa3 Mon Sep 17 00:00:00 2001
From: khanhas <xuankhanh963@gmail.com>
Date: Sun, 10 Jun 2018 21:48:02 +0700
Subject: [PATCH 097/141] Fixed props. Should be in `style` props

---
 types/proton-native/index.d.ts     | 90 +++++++++++++++---------------
 types/proton-native/test/index.tsx | 13 ++++-
 2 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/types/proton-native/index.d.ts b/types/proton-native/index.d.ts
index 0cfb0e5798..b29d0a2b3f 100644
--- a/types/proton-native/index.d.ts
+++ b/types/proton-native/index.d.ts
@@ -170,50 +170,52 @@ export interface AreaPathProps extends AreaBaseProps {
 export class AreaPath extends React.Component<AreaPathProps> { }
 
 export interface AreaTextProps extends AreaBaseProps {
-    /**
-     * The background color, specified as a CSS color string.
-     */
-    backgroundColor?: string;
-    /**
-     * The text color, specified as a CSS color string.
-     */
-    color?: string;
-    /**
-     * The font family (only if available on the system).
-     */
-    fontFamily?: string;
-    /**
-     * The font size (in pt).
-     */
-    fontSize?: number;
-    /**
-     * Whether an italic font should be used.
-     */
-    fontStyle?: 'normal' | 'oblique' | 'italic';
-    /**
-     * Whether a bold font should be used (and the amount).
-     */
-    fontWeight?: 'minimum' | 'thin' | 'ultraLight' | 'light' | 'book' | 'normal' | 'medium' | 'semiBold' | 'bold' | 'ultraBold' | 'heavy' | 'ultraHeavy' | 'maximum' | number;
-    /**
-     * Wheter the text should be aligned to the left, center or right.
-     *
-     * **Works only on a top level text component, not it's children!**
-     */
-    textAlign?: 'left' | 'center' | 'right';
-    /**
-     * How wide or narrow the characters should be.
-     */
-    textStretch?: 'ultraCondensed' | 'extraCondensed' | 'condensed' | 'semiCondensed' | 'normal' | 'semiExpanded' | 'expanded' | 'extraExpanded' | 'ultraExpanded';
-    /**
-     * The text underline style.
-     */
-    textUnderline?: 'none' | 'single' | 'double' | 'suggestion';
-    /**
-     * The text underline color.
-     *
-     * A color string | 'spelling' | 'grammar' | 'auxiliary'
-     */
-    textUnderlineColor?: 'spelling' | 'grammar' | 'auxiliary' | string;
+    style?: {
+        /**
+         * The background color, specified as a CSS color string.
+         */
+        backgroundColor?: string;
+        /**
+         * The text color, specified as a CSS color string.
+         */
+        color?: string;
+        /**
+         * The font family (only if available on the system).
+         */
+        fontFamily?: string;
+        /**
+         * The font size (in pt).
+         */
+        fontSize?: number;
+        /**
+         * Whether an italic font should be used.
+         */
+        fontStyle?: 'normal' | 'oblique' | 'italic';
+        /**
+         * Whether a bold font should be used (and the amount).
+         */
+        fontWeight?: 'minimum' | 'thin' | 'ultraLight' | 'light' | 'book' | 'normal' | 'medium' | 'semiBold' | 'bold' | 'ultraBold' | 'heavy' | 'ultraHeavy' | 'maximum' | number;
+        /**
+         * Wheter the text should be aligned to the left, center or right.
+         *
+         * **Works only on a top level text component, not it's children!**
+         */
+        textAlign?: 'left' | 'center' | 'right';
+        /**
+         * How wide or narrow the characters should be.
+         */
+        textStretch?: 'ultraCondensed' | 'extraCondensed' | 'condensed' | 'semiCondensed' | 'normal' | 'semiExpanded' | 'expanded' | 'extraExpanded' | 'ultraExpanded';
+        /**
+         * The text underline style.
+         */
+        textUnderline?: 'none' | 'single' | 'double' | 'suggestion';
+        /**
+         * The text underline color.
+         *
+         * A color string | 'spelling' | 'grammar' | 'auxiliary'
+         */
+        textUnderlineColor?: 'spelling' | 'grammar' | 'auxiliary' | string;
+    };
     /**
      * The x coordinate of the text's top left corner. (Only in a top level text component.)
      */
diff --git a/types/proton-native/test/index.tsx b/types/proton-native/test/index.tsx
index 6b09fb0d64..49e82efc1b 100644
--- a/types/proton-native/test/index.tsx
+++ b/types/proton-native/test/index.tsx
@@ -131,9 +131,18 @@ class AreaTest extends React.Component {
             <Area>
                 <Area.Rectangle height={10} width={20} x={30} y={40} />
                 <Area.Path d="test" fillMode="nonzero" />
-                <Area.Text fontSize={30}>
+                <Area.Text
+                    style={{
+                        fontSize: 30,
+                        fontWeight: "maximum",
+                        textAlign: "center",
+                        textStretch: "ultraCondensed",
+                    }}
+                >
                     Parent text
-                    <Area.Text fontWeight="maximum">Nested Text</Area.Text>
+                    <Area.Text>
+                        Nested Text
+                    </Area.Text>
                 </Area.Text>
             </Area>
         );

From 8f07db0aca2133e629c7c59d12d5a917cd910056 Mon Sep 17 00:00:00 2001
From: Jesse Bethke <jbethke@localhost.localdomain>
Date: Sun, 10 Jun 2018 12:13:43 -0700
Subject: [PATCH 098/141] 'output' argument of decompress function is
 overloaded to support undefined, string, or DecompressOptions

---
 types/decompress/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 types/decompress/index.d.ts

diff --git a/types/decompress/index.d.ts b/types/decompress/index.d.ts
old mode 100644
new mode 100755
index 745bebcd2e..b70bd4df35
--- a/types/decompress/index.d.ts
+++ b/types/decompress/index.d.ts
@@ -7,7 +7,7 @@
 
 export = decompress;
 
-declare function decompress(input: string | Buffer, output: string, opts?: decompress.DecompressOptions): Promise<decompress.File[]>;
+declare function decompress(input: string | Buffer, output?: string | decompress.DecompressOptions, opts?: decompress.DecompressOptions): Promise<decompress.File[]>;
 
 declare namespace decompress {
     interface File {

From b8e67225bed2bec8c57c51a923629bdc29095073 Mon Sep 17 00:00:00 2001
From: Jesse Bethke <jbethke@localhost.localdomain>
Date: Sun, 10 Jun 2018 12:24:42 -0700
Subject: [PATCH 099/141] Updated definitions by tag

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

diff --git a/types/decompress/index.d.ts b/types/decompress/index.d.ts
index b70bd4df35..2c4f464558 100755
--- a/types/decompress/index.d.ts
+++ b/types/decompress/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for decompress 4.2
 // Project: https://github.com/kevva/decompress#readme
 // Definitions by: York Yao <https://github.com/plantain-00>
+//                 Jesse Bethke <https://github.com/jbethke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />

From 5f8c26171e1e04cb09f5c78b588c0369a4835ad1 Mon Sep 17 00:00:00 2001
From: Jesse Bethke <jbethke@localhost.localdomain>
Date: Sun, 10 Jun 2018 12:25:30 -0700
Subject: [PATCH 100/141] Added additional tests for output argument overload
 alternatives

---
 types/decompress/decompress-tests.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 mode change 100644 => 100755 types/decompress/decompress-tests.ts

diff --git a/types/decompress/decompress-tests.ts b/types/decompress/decompress-tests.ts
old mode 100644
new mode 100755
index 9cb8949d99..b2c80d304a
--- a/types/decompress/decompress-tests.ts
+++ b/types/decompress/decompress-tests.ts
@@ -19,3 +19,24 @@ decompress('unicorn.zip', 'dist', {
 }).then((files: decompress.File[]) => {
 	console.log('done!');
 });
+
+// Test decompress with no output to filesystem
+decompress('unicorn.zip')
+	.then(
+		(files: decompress.File[]) => {
+			console.log('Decompressed ' + files.length + " files with no write to filesystem");
+		}
+	);
+
+// Test decompress with DecompressOptions as second argument
+decompress(
+	'unicorn.zip',
+	{
+		filter: file => path.extname(file.path) !== '.exe'
+	}
+)
+	.then(
+		(files: decompress.File[]) => {
+			console.log('Decompressed ' + files.length + " files with filter options");
+		}
+	);

From fe32c0e5087a8b6df06db16b6e76cd9e3bc430a7 Mon Sep 17 00:00:00 2001
From: Jesse Bethke <jbethke@localhost.localdomain>
Date: Sun, 10 Jun 2018 12:34:45 -0700
Subject: [PATCH 101/141] Fixed string formatting per lint recommendations

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

diff --git a/types/decompress/decompress-tests.ts b/types/decompress/decompress-tests.ts
index b2c80d304a..5ed96c0b46 100755
--- a/types/decompress/decompress-tests.ts
+++ b/types/decompress/decompress-tests.ts
@@ -24,7 +24,7 @@ decompress('unicorn.zip', 'dist', {
 decompress('unicorn.zip')
 	.then(
 		(files: decompress.File[]) => {
-			console.log('Decompressed ' + files.length + " files with no write to filesystem");
+			console.log(`Decompressed ${files.length} files with no write to filesystem`);
 		}
 	);
 
@@ -37,6 +37,6 @@ decompress(
 )
 	.then(
 		(files: decompress.File[]) => {
-			console.log('Decompressed ' + files.length + " files with filter options");
+			console.log(`Decompressed ${files.length} files with filter options`);
 		}
 	);

From be6409bb59550341231c3ae02997dae6e438e72a Mon Sep 17 00:00:00 2001
From: Andrew Makarov <me@r3nya.ru>
Date: Sun, 10 Jun 2018 23:08:28 +0300
Subject: [PATCH 102/141] Update tests

---
 types/node/node-tests.ts    | 2 +-
 types/node/v4/node-tests.ts | 2 +-
 types/node/v6/node-tests.ts | 2 +-
 types/node/v7/node-tests.ts | 2 +-
 types/node/v8/index.d.ts    | 1 +
 types/node/v8/node-tests.ts | 2 +-
 types/node/v9/index.d.ts    | 7 +++++++
 types/node/v9/node-tests.ts | 6 ++++++
 8 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 14a939fb81..4db61a5e40 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -3114,7 +3114,7 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
-    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+    dns.lookupService("127.0.0.1", 0, (err, hostname, service) => {
         const _err: NodeJS.ErrnoException = err;
         const _hostname: string = hostname;
         const _service: string = service;
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index a9471f2bd6..5e63842704 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -1196,7 +1196,7 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
-    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+    dns.lookupService("127.0.0.1", 0, (err, hostname, service) => {
         const _err: NodeJS.ErrnoException = err;
         const _hostname: string = hostname;
         const _service: string = service;
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 2d0666e322..9987b76a71 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -2407,7 +2407,7 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
-    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+    dns.lookupService("127.0.0.1", 0, (err, hostname, service) => {
         const _err: NodeJS.ErrnoException = err;
         const _hostname: string = hostname;
         const _service: string = service;
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index 4d99c91841..f17b3be5db 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -2398,7 +2398,7 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
-    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+    dns.lookupService("127.0.0.1", 0, (err, hostname, service) => {
         const _err: NodeJS.ErrnoException = err;
         const _hostname: string = hostname;
         const _service: string = service;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index ec19101c0a..3e153570d6 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -21,6 +21,7 @@
 //                 Bruno Scheufler <https://github.com/brunoscheufler>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 //                 Lishude <https://github.com/islishude>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 3033956017..dee74cc036 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -3075,7 +3075,7 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
-    dns.lookupService("nodejs.org", 0, (err, hostname, service) => {
+    dns.lookupService("127.0.0.1", 0, (err, hostname, service) => {
         const _err: NodeJS.ErrnoException = err;
         const _hostname: string = hostname;
         const _service: string = service;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 1c9e01cc01..d11f93e382 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -24,6 +24,7 @@
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 //                 Alexander T. <https://github.com/a-tarasyuk>
 //                 Lishude <https://github.com/islishude>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -2525,6 +2526,12 @@ declare module "dns" {
         export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>;
     }
 
+    export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void;
+
+    export namespace lookupService {
+        export function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>;
+    }
+
     export interface ResolveOptions {
         ttl: boolean;
     }
diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts
index b7c7471fe1..72ce012a3c 100644
--- a/types/node/v9/node-tests.ts
+++ b/types/node/v9/node-tests.ts
@@ -3108,6 +3108,12 @@ namespace dns_tests {
         const _family: number | undefined = family;
     });
 
+    dns.lookupService("127.0.0.1", 0, (err, hostname, service) => {
+        const _err: NodeJS.ErrnoException = err;
+        const _hostname: string = hostname;
+        const _service: string = service;
+    });
+
     dns.resolve("nodejs.org", (err, addresses) => {
         const _addresses: string[] = addresses;
     });

From e99bb32da2dfa513cc63737613a083f9336a4c08 Mon Sep 17 00:00:00 2001
From: mbikyaw <kyaw@mechanobio.info>
Date: Mon, 11 Jun 2018 11:47:35 +0800
Subject: [PATCH 103/141] add a new method setStateChanged for
 ActionResponseBuilder

---
 types/google-apps-script/google-apps-script.card.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/google-apps-script/google-apps-script.card.d.ts b/types/google-apps-script/google-apps-script.card.d.ts
index 62d497eb4f..d879d30091 100644
--- a/types/google-apps-script/google-apps-script.card.d.ts
+++ b/types/google-apps-script/google-apps-script.card.d.ts
@@ -82,6 +82,10 @@ declare namespace GoogleAppsScript {
              * Sets the URL to navigate to when the action is activated.
              */
             setOpenLink(openLink: OpenLink): ActionResponseBuilder;
+            /**
+             * Sets a flag to indicate that this action changed the existing data state.
+             */
+            setStateChanged(stateChanged: boolean): ActionResponseBuilder;
         }
 
         export interface AuthorizationAction {

From b6d37208cf1b06cf5aa760dcc1db9a9a82f1315a Mon Sep 17 00:00:00 2001
From: khanhas <xuankhanh963@gmail.com>
Date: Mon, 11 Jun 2018 13:55:15 +0700
Subject: [PATCH 104/141] Added AreaGroup and test

---
 types/proton-native/index.d.ts     | 19 +++++++++++++++++++
 types/proton-native/test/index.tsx | 30 ++++++++++++++++--------------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/types/proton-native/index.d.ts b/types/proton-native/index.d.ts
index b29d0a2b3f..635f180b0e 100644
--- a/types/proton-native/index.d.ts
+++ b/types/proton-native/index.d.ts
@@ -228,6 +228,19 @@ export interface AreaTextProps extends AreaBaseProps {
 
 export class AreaText extends React.Component<AreaTextProps> { }
 
+export interface AreaGroupProps extends AreaBaseProps {
+    /**
+     * Specify `width` and `height` to be able to use percentage values in transforms.
+     */
+    width?: number | string;
+    /**
+     * Specify `width` and `height` to be able to use percentage values in transforms.
+     */
+    height?: number | string;
+}
+
+export class AreaGroup extends React.Component<AreaGroupProps> { }
+
 export interface MouseEvent {
     button: number;
     height: number;
@@ -301,6 +314,12 @@ export class Area extends React.Component<AreaProps> {
      * A circle to be displayed in an Area component.
      */
     static Circle: typeof AreaCircle;
+    /**
+     * A component to apply props to all it's children in an Area component.
+     *
+     * To be able to use percentage values in transforms, the props `width` and `height` need to be specified (they have no graphical effect).
+     */
+    static Group: typeof AreaGroup;
     /**
      * A straigt line to be displayed in an Area component.
      */
diff --git a/types/proton-native/test/index.tsx b/types/proton-native/test/index.tsx
index 49e82efc1b..901cf3e155 100644
--- a/types/proton-native/test/index.tsx
+++ b/types/proton-native/test/index.tsx
@@ -129,21 +129,23 @@ class AreaTest extends React.Component {
     render() {
         return (
             <Area>
-                <Area.Rectangle height={10} width={20} x={30} y={40} />
-                <Area.Path d="test" fillMode="nonzero" />
-                <Area.Text
-                    style={{
-                        fontSize: 30,
-                        fontWeight: "maximum",
-                        textAlign: "center",
-                        textStretch: "ultraCondensed",
-                    }}
-                >
-                    Parent text
-                    <Area.Text>
-                        Nested Text
+                <Area.Group width={30} height={20}>
+                    <Area.Rectangle height={10} width={20} x={30} y={40} />
+                    <Area.Path d="test" fillMode="nonzero" />
+                    <Area.Text
+                        style={{
+                            fontSize: 30,
+                            fontWeight: "maximum",
+                            textAlign: "center",
+                            textStretch: "ultraCondensed",
+                        }}
+                    >
+                        Parent text
+                        <Area.Text>
+                            Nested Text
+                        </Area.Text>
                     </Area.Text>
-                </Area.Text>
+                </Area.Group>
             </Area>
         );
     }

From 865e5c9c13d884001f46e8ffeaee6ac0f9be613f Mon Sep 17 00:00:00 2001
From: Benjamin Wilfing <benjamin.wilfing@acomodeo.com>
Date: Mon, 11 Jun 2018 10:58:47 +0200
Subject: [PATCH 105/141] angular-translate: Update typings for version 2.16

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

diff --git a/types/angular-translate/index.d.ts b/types/angular-translate/index.d.ts
index 719fcb5d5c..f35fb57570 100644
--- a/types/angular-translate/index.d.ts
+++ b/types/angular-translate/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular Translate (pascalprecht.translate module) 2.15
+// Type definitions for Angular Translate (pascalprecht.translate module) 2.16
 // Project: https://github.com/PascalPrecht/angular-translate
 // Definitions by: Michel Salib <https://github.com/michelsalib>, Gabriel Gil <https://github.com/GabrielGil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -47,8 +47,8 @@ declare module 'angular' {
         }
 
         interface ITranslateService {
-            (translationId: string, interpolateParams?: any, interpolationId?: string, defaultTranslationText?: string, forceLanguage?: string): angular.IPromise<string>;
-            (translationId: string[], interpolateParams?: any, interpolationId?: string, defaultTranslationText?: string, forceLanguage?: string): angular.IPromise<{ [key: string]: string }>;
+            (translationId: string, interpolateParams?: any, interpolationId?: string, defaultTranslationText?: string, forceLanguage?: string, sanitizeStrategy?: string): angular.IPromise<string>;
+            (translationId: string[], interpolateParams?: any, interpolationId?: string, defaultTranslationText?: string, forceLanguage?: string, sanitizeStrategy?: string): angular.IPromise<{ [key: string]: string }>;
             cloakClassName(): string;
             cloakClassName(name: string): ITranslateProvider;
             fallbackLanguage(langKey?: string): string;

From d9c5007c85f1c640dc4d09156c841a2afa946ea0 Mon Sep 17 00:00:00 2001
From: pvavrik <pavelv@salsitasoft.com>
Date: Mon, 11 Jun 2018 15:07:30 +0200
Subject: [PATCH 106/141] ThreeJS : Add color param to Light helpers

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

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 3ad1568409..74ebd4adcf 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -7434,10 +7434,11 @@ export class CameraHelper extends LineSegments {
 }
 
 export class DirectionalLightHelper extends Object3D {
-    constructor(light: Light, size?: number);
+    constructor(light: Light, size?: number, color?: Color | string | number);
 
     light: Light;
     lightPlane: Line;
+    color: Color | string | number;
 
     dispose(): void;
     update(): void;
@@ -7479,9 +7480,11 @@ export class HemisphereLightHelper extends Object3D {
 }
 
 export class PointLightHelper extends Object3D {
-    constructor(light: Light, sphereSize: number);
+    constructor(light: Light, sphereSize?: number, color?: Color | string | number);
 
     light: Light;
+    sphereSize: number;
+    color: Color | string | number;
 
     dispose(): void;
     update(): void;
@@ -7498,9 +7501,10 @@ export class SkeletonHelper extends LineSegments {
 }
 
 export class SpotLightHelper extends Object3D {
-    constructor(light: Light);
+    constructor(light: Light, color?: Color | string | number);
 
     light: Light;
+    color: Color | string | number;
 
     dispose(): void;
     update(): void;

From 7492a8c9857d3a550170125c738ed6f30416042f Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Tue, 12 Jun 2018 01:37:08 +0700
Subject: [PATCH 107/141] [next] address code review

---
 types/next/app.d.ts      |  7 ++++---
 types/next/document.d.ts |  2 +-
 types/next/index.d.ts    | 37 ++++++++++++++++++++++---------------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/types/next/app.d.ts b/types/next/app.d.ts
index 0296440ddb..18bca653cf 100644
--- a/types/next/app.d.ts
+++ b/types/next/app.d.ts
@@ -1,5 +1,6 @@
 import * as React from "react";
 import { NextContext } from ".";
+import { SingletonRouter } from "./router";
 
 export interface AppComponentProps {
     Component: React.ComponentType<any>;
@@ -7,11 +8,11 @@ export interface AppComponentProps {
 }
 
 export interface AppComponentContext {
-    Component: any;
-    router: any; // TODO: could be SingletonRouter?
+    Component: React.ComponentType<any>;
+    router: SingletonRouter;
     ctx: NextContext;
 }
 
 export class Container extends React.Component {}
 
-export default class App<P = {}> extends React.Component<P & AppComponentProps> {}
+export default class App<TProps = {}> extends React.Component<TProps & AppComponentProps> {}
diff --git a/types/next/document.d.ts b/types/next/document.d.ts
index bcc4cf737b..38e20e00c0 100644
--- a/types/next/document.d.ts
+++ b/types/next/document.d.ts
@@ -29,5 +29,5 @@ export class Head extends React.Component<any> {}
 export class Main extends React.Component {}
 export class NextScript extends React.Component {}
 export default class extends React.Component<DocumentProps> {
-    static getInitialProps(ctx: Context): DocumentProps;
+    static getInitialProps(ctx: NextContext): DocumentProps;
 }
diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 202c63ff0f..95395bc2b8 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -25,7 +25,13 @@ declare namespace next {
         pathname: string;
         /** query string section of URL parsed as an object */
         query: {
-            [key: string]: any
+            [key: string]:
+                | boolean
+                | boolean[]
+                | number
+                | number[]
+                | string
+                | string[];
         };
         /** String of the actual path (including the query) shows in the browser */
         asPath: string;
@@ -39,9 +45,10 @@ declare namespace next {
         err?: Error;
     }
 
-    type NextSFC<P = {}> = NextStatelessComponent<P>;
-    interface NextStatelessComponent<P = {}> extends React.StatelessComponent<P> {
-        getInitialProps?: (ctx: NextContext) => Promise<any>;
+    type NextSFC<TProps = {}> = NextStatelessComponent<TProps>;
+    interface NextStatelessComponent<TProps = {}>
+        extends React.StatelessComponent<TProps> {
+        getInitialProps?: (ctx: NextContext) => Promise<TProps>;
     }
 
     type UrlLike = url.UrlObject | url.Url;
@@ -73,12 +80,12 @@ declare namespace next {
         handleRequest(
             req: http.IncomingMessage,
             res: http.ServerResponse,
-            parsedUrl?: UrlLike,
+            parsedUrl?: UrlLike
         ): Promise<void>;
         getRequestHandler(): (
             req: http.IncomingMessage,
             res: http.ServerResponse,
-            parsedUrl?: UrlLike,
+            parsedUrl?: UrlLike
         ) => Promise<void>;
         prepare(): Promise<void>;
         close(): Promise<void>;
@@ -87,7 +94,7 @@ declare namespace next {
         run(
             req: http.IncomingMessage,
             res: http.ServerResponse,
-            parsedUrl: UrlLike,
+            parsedUrl: UrlLike
         ): Promise<void>;
 
         render(
@@ -103,7 +110,7 @@ declare namespace next {
                     | string
                     | string[];
             },
-            parsedUrl?: UrlLike,
+            parsedUrl?: UrlLike
         ): Promise<void>;
         renderError(
             err: any,
@@ -118,12 +125,12 @@ declare namespace next {
                     | number[]
                     | string
                     | string[];
-            },
+            }
         ): Promise<void>;
         render404(
             req: http.IncomingMessage,
             res: http.ServerResponse,
-            parsedUrl: UrlLike,
+            parsedUrl: UrlLike
         ): Promise<void>;
         renderToHTML(
             req: http.IncomingMessage,
@@ -137,7 +144,7 @@ declare namespace next {
                     | number[]
                     | string
                     | string[];
-            },
+            }
         ): Promise<string>;
         renderErrorToHTML(
             err: any,
@@ -152,13 +159,13 @@ declare namespace next {
                     | number[]
                     | string
                     | string[];
-            },
+            }
         ): Promise<string>;
 
         serveStatic(
             req: http.IncomingMessage,
             res: http.ServerResponse,
-            path: string,
+            path: string
         ): Promise<void>;
         isServeableUrl(path: string): boolean;
         isInternalUrl(req: http.IncomingMessage): boolean;
@@ -167,12 +174,12 @@ declare namespace next {
         getCompilationError(
             page: string,
             req: http.IncomingMessage,
-            res: http.ServerResponse,
+            res: http.ServerResponse
         ): Promise<any>;
         handleBuildHash(
             filename: string,
             hash: string,
-            res: http.ServerResponse,
+            res: http.ServerResponse
         ): void;
         send404(res: http.ServerResponse): void;
     }

From 209627be7e02ed7c9b4e1ecc1fd98308c4125355 Mon Sep 17 00:00:00 2001
From: Elizabeth Samuel <elizs@microsoft.com>
Date: Mon, 11 Jun 2018 11:57:15 -0700
Subject: [PATCH 108/141] Update the lead-in statements for Body description
 examples

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index e4cb2bb0cc..ff8b216c71 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -5847,7 +5847,7 @@ declare namespace Office {
          *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -5868,7 +5868,7 @@ declare namespace Office {
          *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -5888,7 +5888,7 @@ declare namespace Office {
          *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -5906,7 +5906,7 @@ declare namespace Office {
          *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -5923,7 +5923,7 @@ declare namespace Office {
          *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
@@ -5948,7 +5948,7 @@ declare namespace Office {
          *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
@@ -5972,7 +5972,7 @@ declare namespace Office {
          *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
@@ -5994,7 +5994,7 @@ declare namespace Office {
          *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
@@ -6016,7 +6016,7 @@ declare namespace Office {
          *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -6041,7 +6041,7 @@ declare namespace Office {
          *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -6065,7 +6065,7 @@ declare namespace Office {
          *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -6087,7 +6087,7 @@ declare namespace Office {
          *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *

From b6ba570873e321086df8cba82dc934f292ad70ef Mon Sep 17 00:00:00 2001
From: Michael Prokopchuk <prokopcm@gmail.com>
Date: Mon, 11 Jun 2018 16:22:41 -0400
Subject: [PATCH 109/141] Improve GLView interface and associated types

---
 types/expo/index.d.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index e556e5255a..cb7a14381b 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -7,6 +7,7 @@
 //                 Fernando Helwanger <https://github.com/fhelwanger>
 //                 Umidbek Karimov <https://github.com/umidbekkarimov>
 //                 Moshe Feuchtwanger <https://github.com/moshfeu>
+//                 Michael Prokopchuk <https://github.com/prokopcm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -1390,12 +1391,24 @@ export namespace Font {
 }
 
 // #region GLView
+export interface ExpoWebGLRenderingContext extends WebGLRenderingContext {
+    endFrameEXP(): any;
+}
+
 /**
- * GLView
+ * A View that acts as an OpenGL ES render target. On mounting, an OpenGL ES
+ * context is created. Its drawing buffer is presented as the contents of
+ * the View every frame.
  */
 export interface GLViewProps extends ViewProps {
-    onContextCreate(): void;
-    msaaSamples: number;
+    /**
+     * A function that will be called when the OpenGL ES context is created.
+     * Passes an object with a WebGLRenderingContext interface as an argument.
+     */
+    onContextCreate(gl: ExpoWebGLRenderingContext): void;
+
+    /** Number of MSAA samples to use on iOS. Defaults to 4. Ignored on Android. */
+    msaaSamples?: number;
 }
 
 export class GLView extends Component<GLViewProps, { msaaSamples: number }> { }

From 2f6fd069334b1b69031979abb7416ca36dd01367 Mon Sep 17 00:00:00 2001
From: Michael Prokopchuk <prokopcm@gmail.com>
Date: Mon, 11 Jun 2018 16:26:28 -0400
Subject: [PATCH 110/141] Update endFrameEXP return type so it's more accurate

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

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index cb7a14381b..048d7b884d 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1392,7 +1392,7 @@ export namespace Font {
 
 // #region GLView
 export interface ExpoWebGLRenderingContext extends WebGLRenderingContext {
-    endFrameEXP(): any;
+    endFrameEXP(): void;
 }
 
 /**

From 19ec811c7ab4b36c20db22c444dbeab168261ef1 Mon Sep 17 00:00:00 2001
From: Martin Hochel <hochelmartin@gmail.com>
Date: Mon, 11 Jun 2018 23:14:27 +0200
Subject: [PATCH 111/141] feat(jest): mirror jest repo config definitions

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index b7b60f2e53..53b0fb8c3b 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -796,7 +796,164 @@ declare namespace jest {
 
     type SnapshotUpdateState = 'all' | 'new' | 'none';
 
-    // https://facebook.github.io/jest/docs/en/cli.html#options
+    interface DefaultOptions {
+        automock: boolean;
+        bail: boolean;
+        browser: boolean;
+        cache: boolean;
+        cacheDirectory: Path;
+        changedFilesWithAncestor: boolean;
+        clearMocks: boolean;
+        collectCoverage: boolean;
+        collectCoverageFrom: Maybe<string[]>;
+        coverageDirectory: Maybe<string>;
+        coveragePathIgnorePatterns: string[];
+        coverageReporters: string[];
+        coverageThreshold: Maybe<{global: {[key: string]: number}}>;
+        errorOnDeprecated: boolean;
+        expand: boolean;
+        filter: Maybe<Path>;
+        forceCoverageMatch: Glob[];
+        globals: ConfigGlobals;
+        globalSetup: Maybe<string>;
+        globalTeardown: Maybe<string>;
+        haste: HasteConfig;
+        detectLeaks: boolean;
+        detectOpenHandles: boolean;
+        moduleDirectories: string[];
+        moduleFileExtensions: string[];
+        moduleNameMapper: {[key: string]: string};
+        modulePathIgnorePatterns: string[];
+        noStackTrace: boolean;
+        notify: boolean;
+        notifyMode: string;
+        preset: Maybe<string>;
+        projects: Maybe<Array<string | ProjectConfig>>;
+        resetMocks: boolean;
+        resetModules: boolean;
+        resolver: Maybe<Path>;
+        restoreMocks: boolean;
+        rootDir: Maybe<Path>;
+        roots: Maybe<Path[]>;
+        runner: string;
+        runTestsByPath: boolean;
+        setupFiles: Path[];
+        setupTestFrameworkScriptFile: Maybe<Path>;
+        skipFilter: boolean;
+        snapshotSerializers: Path[];
+        testEnvironment: string;
+        testEnvironmentOptions: object;
+        testFailureExitCode: string | number;
+        testLocationInResults: boolean;
+        testMatch: Glob[];
+        testPathIgnorePatterns: string[];
+        testRegex: string;
+        testResultsProcessor: Maybe<string>;
+        testRunner: Maybe<string>;
+        testURL: string;
+        timers: 'real' | 'fake';
+        transform: Maybe<{[key: string]: string}>;
+        transformIgnorePatterns: Glob[];
+        watchPathIgnorePatterns: string[];
+        useStderr: boolean;
+        verbose: Maybe<boolean>;
+        watch: boolean;
+        watchman: boolean;
+    }
+
+    interface InitialOptions {
+        automock?: boolean;
+        bail?: boolean;
+        browser?: boolean;
+        cache?: boolean;
+        cacheDirectory?: Path;
+        clearMocks?: boolean;
+        changedFilesWithAncestor?: boolean;
+        changedSince?: string;
+        collectCoverage?: boolean;
+        collectCoverageFrom?: Glob[];
+        collectCoverageOnlyFrom?: {[key: string]: boolean};
+        coverageDirectory?: string;
+        coveragePathIgnorePatterns?: string[];
+        coverageReporters?: string[];
+        coverageThreshold?: {global: {[key: string]: number}};
+        detectLeaks?: boolean;
+        detectOpenHandles?: boolean;
+        displayName?: string;
+        expand?: boolean;
+        filter?: Path;
+        findRelatedTests?: boolean;
+        forceCoverageMatch?: Glob[];
+        forceExit?: boolean;
+        json?: boolean;
+        globals?: ConfigGlobals;
+        globalSetup?: Maybe<string>;
+        globalTeardown?: Maybe<string>;
+        haste?: HasteConfig;
+        reporters?: Array<ReporterConfig | string>;
+        logHeapUsage?: boolean;
+        lastCommit?: boolean;
+        listTests?: boolean;
+        mapCoverage?: boolean;
+        moduleDirectories?: string[];
+        moduleFileExtensions?: string[];
+        moduleLoader?: Path;
+        moduleNameMapper?: {[key: string]: string};
+        modulePathIgnorePatterns?: string[];
+        modulePaths?: string[];
+        name?: string;
+        noStackTrace?: boolean;
+        notify?: boolean;
+        notifyMode?: string;
+        onlyChanged?: boolean;
+        outputFile?: Path;
+        passWithNoTests?: boolean;
+        preprocessorIgnorePatterns?: Glob[];
+        preset?: Maybe<string>;
+        projects?: Glob[];
+        replname?: Maybe<string>;
+        resetMocks?: boolean;
+        resetModules?: boolean;
+        resolver?: Maybe<Path>;
+        restoreMocks?: boolean;
+        rootDir?: Path;
+        roots?: Path[];
+        runner?: string;
+        runTestsByPath?: boolean;
+        scriptPreprocessor?: string;
+        setupFiles?: Path[];
+        setupTestFrameworkScriptFile?: Path;
+        silent?: boolean;
+        skipFilter?: boolean;
+        skipNodeResolution?: boolean;
+        snapshotSerializers?: Path[];
+        errorOnDeprecated?: boolean;
+        testEnvironment?: string;
+        testEnvironmentOptions?: object;
+        testFailureExitCode?: string | number;
+        testLocationInResults?: boolean;
+        testMatch?: Glob[];
+        testNamePattern?: string;
+        testPathDirs?: Path[];
+        testPathIgnorePatterns?: string[];
+        testRegex?: string;
+        testResultsProcessor?: Maybe<string>;
+        testRunner?: string;
+        testURL?: string;
+        timers?: 'real' | 'fake';
+        transform?: {[key: string]: string};
+        transformIgnorePatterns?: Glob[];
+        watchPathIgnorePatterns?: string[];
+        unmockedModulePathPatterns?: string[];
+        updateSnapshot?: boolean;
+        useStderr?: boolean;
+        verbose?: Maybe<boolean>;
+        watch?: boolean;
+        watchAll?: boolean;
+        watchman?: boolean;
+        watchPlugins?: string[];
+    }
+
     interface GlobalConfig {
         bail: boolean;
         collectCoverage: boolean;
@@ -826,7 +983,6 @@ declare namespace jest {
         watchman: boolean;
     }
 
-    // https://facebook.github.io/jest/docs/en/configuration.html#options
     interface ProjectConfig {
         automock: boolean;
         browser: boolean;
@@ -866,7 +1022,7 @@ declare namespace jest {
         testRunner: string;
         testURL: string;
         timers: 'real' | 'fake';
-        transform: {[regexpGlob: string]: string};
+        transform: Array<[string, Path]>;
         transformIgnorePatterns: Glob[];
         unmockedModulePathPatterns: Maybe<string[]>;
         watchPathIgnorePatterns: string[];
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index b8dff71522..b549826049 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -734,10 +734,11 @@ test('moduleName 2', () => {
 
 // Jest config
 {
+interface JestConfigModule {defaults: jest.DefaultOptions; }
 // tslint:disable-next-line:no-var-requires
-const {defaults} = require('jest-config') as {defaults: jest.ProjectConfig};
+const {defaults} = require('jest-config') as JestConfigModule;
 
-const config: Partial<jest.ProjectConfig> = {
+const config: jest.InitialOptions = {
   transform: {
     '^.+\\.(ts|tsx)$': 'ts-jest'
   },

From a3d7bf13c94720525d566087693d007d200313e8 Mon Sep 17 00:00:00 2001
From: Siggy Bilstein <sbilstein@gmail.com>
Date: Mon, 11 Jun 2018 17:11:54 -0700
Subject: [PATCH 112/141] Add a type for PrismicDOM.RichText text function

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

diff --git a/types/prismic-dom/index.d.ts b/types/prismic-dom/index.d.ts
index 2849cc7791..5c16729029 100644
--- a/types/prismic-dom/index.d.ts
+++ b/types/prismic-dom/index.d.ts
@@ -1,10 +1,12 @@
 // Type definitions for prismic-dom 2.0
 // Project: https://github.com/prismicio/prismic-dom#readme
 // Definitions by: Nick Whyte <https://github.com/nickw444>
+//                 Siggy Bilstein <https://github.com/sbilstein>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface RichText {
     asHtml(richText: any, linkResolver?: (doc: any) => string): string;
+    asText(richText: any, linkResolver?: (doc: any) => string): string;
 }
 
 export const RichText: RichText;

From 1b269424bbbebf192a3910780008dc22772b44f7 Mon Sep 17 00:00:00 2001
From: Sami Jaber <jabersami@gmail.com>
Date: Mon, 11 Jun 2018 20:35:31 -0400
Subject: [PATCH 113/141] react-autocomplete: add Input element methods

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

diff --git a/types/react-autocomplete/index.d.ts b/types/react-autocomplete/index.d.ts
index c1e3aefa0f..58339d3b31 100644
--- a/types/react-autocomplete/index.d.ts
+++ b/types/react-autocomplete/index.d.ts
@@ -144,4 +144,16 @@ declare namespace Autocomplete {
         debug?: boolean;
     }
 }
-declare class Autocomplete extends Component<Autocomplete.Props> {}
+declare class Autocomplete extends Component<Autocomplete.Props> {
+    /**
+     * Autocomplete exposes a subset of `HTMLInputElement` properties to the parent component.
+     * They can be accessed through Autocomplete's `ref` prop.
+     */
+    blur: HTMLInputElement['blur'];
+    checkValidity: HTMLInputElement['checkValidity'];
+    click: HTMLInputElement['click'];
+    focus: HTMLInputElement['focus'];
+    select: HTMLInputElement['select'];
+    setCustomValidity: HTMLInputElement['setCustomValidity'];
+    setSelectionRange: HTMLInputElement['setSelectionRange'];
+}

From 3f2440063956259b4fb7b6de6fab0452890b61dc Mon Sep 17 00:00:00 2001
From: Siggy Bilstein <sbilstein@gmail.com>
Date: Mon, 11 Jun 2018 17:36:04 -0700
Subject: [PATCH 114/141] Fix type to actually match the implementation

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

diff --git a/types/prismic-dom/index.d.ts b/types/prismic-dom/index.d.ts
index 5c16729029..ba101e1041 100644
--- a/types/prismic-dom/index.d.ts
+++ b/types/prismic-dom/index.d.ts
@@ -6,7 +6,7 @@
 
 interface RichText {
     asHtml(richText: any, linkResolver?: (doc: any) => string): string;
-    asText(richText: any, linkResolver?: (doc: any) => string): string;
+    asText(richText: any,  joinString?: string): string;
 }
 
 export const RichText: RichText;

From d23f476f1cf0ae7bffe946592742e8c21c079ac1 Mon Sep 17 00:00:00 2001
From: Bradley Ayers <bradley.ayers@gmail.com>
Date: Tue, 12 Jun 2018 11:16:46 +1000
Subject: [PATCH 115/141] chore(jest): remove myself as maintainer

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 2afe0eb750..dc063f5d47 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -12,7 +12,6 @@
 //                 Douglas Duteil <https://github.com/douglasduteil>
 //                 Ahn <https://github.com/ahnpnl>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
-//                 Bradley Ayers <https://github.com/bradleyayers>
 //                 Jeff Lau <https://github.com/UselessPickles>
 //                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 2e3bfeaf20b7c9af2774c5b776ebf8acdc3a453b Mon Sep 17 00:00:00 2001
From: Arttu Liimola <arttu.liimola@stevetheclerk.com>
Date: Tue, 12 Jun 2018 06:44:35 +0300
Subject: [PATCH 116/141] [@types/mathjs] Add Fraction as parameter type for
 number() method.

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

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index cdecc3e1b4..92015f72ff 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -543,7 +543,7 @@ declare namespace math { // tslint:disable-line strict-export-declare-modifiers
 		/**
 		 * Create a number or convert a string, boolean, or unit to a number. When value is a matrix, all elements will be converted to number.
 		 */
-		number(value?: string|number|boolean|MathArray|Matrix|Unit|BigNumber): number|MathArray|Matrix;
+		number(value?: string|number|boolean|MathArray|Matrix|Unit|BigNumber|Fraction): number|MathArray|Matrix;
 		number(unit: Unit, valuelessUnit: Unit|string): number|MathArray|Matrix;
 
 		/**

From 76595977b6ff1ecb7939c7ef3ddfbfe1d3f8e069 Mon Sep 17 00:00:00 2001
From: Martin Hochel <hochelmartin@gmail.com>
Date: Tue, 12 Jun 2018 07:22:34 +0200
Subject: [PATCH 117/141] feat(jest): bump version to match api with
 definitions

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 801a7408fd..2cc9ef2f4a 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Jest 23.0
+// Type definitions for Jest 23.1
 // Project: http://facebook.github.io/jest/
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>

From 7b6f4d124396c6a430c0456d1989932c6a456502 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Tue, 12 Jun 2018 12:47:47 +0700
Subject: [PATCH 118/141] [next] fix component tests to include grabbing query
 context

---
 types/next/test/next-component-tests.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/types/next/test/next-component-tests.tsx b/types/next/test/next-component-tests.tsx
index 8e1d6178fb..55173fd25c 100644
--- a/types/next/test/next-component-tests.tsx
+++ b/types/next/test/next-component-tests.tsx
@@ -1,13 +1,14 @@
 import * as React from "react";
-import { NextStatelessComponent } from "next";
+import { NextStatelessComponent, NextContext } from "next";
 
 interface NextComponentProps {
     example: string;
 }
 
 class ClassNext extends React.Component<NextComponentProps> {
-    static async getInitialProps() {
-        return { example: 'example' };
+    static async getInitialProps(ctx: NextContext) {
+        const { example } = ctx.query;
+        return { example };
     }
 
     render() {
@@ -21,6 +22,7 @@ const StatelessNext: NextStatelessComponent<NextComponentProps> = ({ example })
     <div>I'm a stateless component! {example}</div>
 );
 
-StatelessNext.getInitialProps = async () => {
-    return { example: 'example' };
+StatelessNext.getInitialProps = async ({ query }: NextContext) => {
+    const { example } = query;
+    return { example: example as string };
 };

From 4a17bfcc0dd93afc4596e4c184223f8c851e8c41 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Tue, 12 Jun 2018 12:59:47 +0700
Subject: [PATCH 119/141] [next] query keys only return `string`

---
 types/next/index.d.ts                    | 8 +-------
 types/next/test/next-component-tests.tsx | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 95395bc2b8..4de1be3809 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -25,13 +25,7 @@ declare namespace next {
         pathname: string;
         /** query string section of URL parsed as an object */
         query: {
-            [key: string]:
-                | boolean
-                | boolean[]
-                | number
-                | number[]
-                | string
-                | string[];
+            [key: string]: string;
         };
         /** String of the actual path (including the query) shows in the browser */
         asPath: string;
diff --git a/types/next/test/next-component-tests.tsx b/types/next/test/next-component-tests.tsx
index 55173fd25c..4cf6acbf50 100644
--- a/types/next/test/next-component-tests.tsx
+++ b/types/next/test/next-component-tests.tsx
@@ -24,5 +24,5 @@ const StatelessNext: NextStatelessComponent<NextComponentProps> = ({ example })
 
 StatelessNext.getInitialProps = async ({ query }: NextContext) => {
     const { example } = query;
-    return { example: example as string };
+    return { example };
 };

From 512782a734254850dc31005b359cdf3f5239aa75 Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Tue, 12 Jun 2018 13:17:18 +0700
Subject: [PATCH 120/141] Revert "[next] query keys only return `string`"

This reverts commit 4a17bfcc0dd93afc4596e4c184223f8c851e8c41.
---
 types/next/index.d.ts                    | 8 +++++++-
 types/next/test/next-component-tests.tsx | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 4de1be3809..95395bc2b8 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -25,7 +25,13 @@ declare namespace next {
         pathname: string;
         /** query string section of URL parsed as an object */
         query: {
-            [key: string]: string;
+            [key: string]:
+                | boolean
+                | boolean[]
+                | number
+                | number[]
+                | string
+                | string[];
         };
         /** String of the actual path (including the query) shows in the browser */
         asPath: string;
diff --git a/types/next/test/next-component-tests.tsx b/types/next/test/next-component-tests.tsx
index 4cf6acbf50..55173fd25c 100644
--- a/types/next/test/next-component-tests.tsx
+++ b/types/next/test/next-component-tests.tsx
@@ -24,5 +24,5 @@ const StatelessNext: NextStatelessComponent<NextComponentProps> = ({ example })
 
 StatelessNext.getInitialProps = async ({ query }: NextContext) => {
     const { example } = query;
-    return { example };
+    return { example: example as string };
 };

From 446da95f1cde78313db74661bee66ecfac386175 Mon Sep 17 00:00:00 2001
From: Alexaner T <alexander.v.tarasyuk@gmail.com>
Date: Tue, 12 Jun 2018 11:18:22 +0300
Subject: [PATCH 121/141] add missed props to synthetic event

---
 types/react-native/index.d.ts     |  4 ++++
 types/react-native/test/index.tsx | 25 ++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index eaa2dcccfc..b06d877c4c 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -10,6 +10,7 @@
 //                 Manuel Alabor <https://github.com/swissmanu>
 //                 Michele Bombardi <https://github.com/bm-software>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
+//                 Alexander T. <https://github.com/a-tarasyuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -360,6 +361,9 @@ export interface NativeSyntheticEvent<T> {
     eventPhase: number;
     isTrusted: boolean;
     nativeEvent: T;
+    isPropagationStopped(): boolean;
+    isDefaultPrevented(): boolean;
+    persist(): void;
     preventDefault(): void;
     stopPropagation(): void;
     target: NodeHandle;
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 1f506eb124..9fbad8a870 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -49,10 +49,12 @@ import {
     NativeModules,
     MaskedViewIOS,
     TextInput,
+    TouchableNativeFeedback,
     TextInputFocusEventData,
     InputAccessoryView,
     StatusBar,
-    NativeSyntheticEvent
+    NativeSyntheticEvent,
+    GestureResponderEvent
 } from "react-native";
 
 declare module "react-native" {
@@ -195,6 +197,27 @@ class Welcome extends React.Component {
 
 export default Welcome;
 
+// SyntheticEventsTest
+export class SyntheticEventsTest extends React.Component {
+    onPressButton(e: GestureResponderEvent) {
+        e.persist();
+        e.isPropagationStopped();
+        e.isDefaultPrevented();
+    }
+
+    render() {
+        return (
+            <TouchableNativeFeedback
+                onPress={this.onPressButton}
+            >
+                <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
+                    <Text style={{margin: 30}}>Button</Text>
+                </View>
+            </TouchableNativeFeedback>
+        )
+    }
+}
+
 // App State
 
 function appStateListener(state: string) {

From 790dd43661c2f386a48075fbf16c92be12cfe36c Mon Sep 17 00:00:00 2001
From: Matt Oakes <hello@mattoakes.net>
Date: Tue, 12 Jun 2018 14:12:41 +0100
Subject: [PATCH 122/141] Add the optional access token to the Auth0 Identity
 response

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

diff --git a/types/auth0/index.d.ts b/types/auth0/index.d.ts
index aa82e908e5..be87ceed2c 100644
--- a/types/auth0/index.d.ts
+++ b/types/auth0/index.d.ts
@@ -350,6 +350,7 @@ export interface Identity {
   user_id: string;
   provider: string;
   isSocial: boolean;
+  access_token?: string;
   profileData?: {
     email?: string;
     email_verified?: boolean;   
@@ -882,4 +883,4 @@ export class UsersManager {
 
   impersonate(userId: string, settings: ImpersonateSettingOptions): Promise<any>;
   impersonate(userId: string, settings: ImpersonateSettingOptions, cb: (err: Error, data: any) => void): void;
-}
\ No newline at end of file
+}

From 87dc17787c8c3104bf8bc08eb04303c8169e134a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miika=20H=C3=A4nninen?= <miika.hanninen@reaktor.com>
Date: Tue, 12 Jun 2018 18:12:31 +0300
Subject: [PATCH 123/141] Add pipeK, pipeP, composeK, composeP

---
 types/ramda/index.d.ts | 206 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 204 insertions(+), 2 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 6337e08d9e..cc9616f131 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -420,12 +420,72 @@ declare namespace R {
             fn0: (x0: V0, x1: V1, x2: V2) => T1): (x0: V0, x1: V1, x2: V2) => T6;
 
         /**
-         * TODO composeK
+         * Returns the right-to-left Kleisli composition of the provided functions, each of which must return a value of a type supported by chain.
+         * The typings only support arrays for now.
+         * All functions must be unary.
+         * R.composeK(h, g, f) is equivalent to R.compose(R.chain(h), R.chain(g), f).
          */
+        composeK<V0, T1>(
+            fn0: (x0: V0) => T1[]): (x0: V0) => T1[];
+        composeK<V0, T1, T2>(
+            fn1: (x: T1) => T2[],
+            fn0: (x0: V0) => T1[]): (x0: V0) => T2[];
+        composeK<V0, T1, T2, T3>(
+            fn2: (x: T2) => T3[],
+            fn1: (x: T1) => T2[],
+            fn0: (x: V0) => T1[]): (x: V0) => T3[];
+        composeK<V0, T1, T2, T3, T4>(
+            fn3: (x: T3) => T4[],
+            fn2: (x: T2) => T3[],
+            fn1: (x: T1) => T2[],
+            fn0: (x: V0) => T1[]): (x: V0) => T4[];
+        composeK<V0, T1, T2, T3, T4, T5>(
+            fn4: (x: T4) => T5[],
+            fn3: (x: T3) => T4[],
+            fn2: (x: T2) => T3[],
+            fn1: (x: T1) => T2[],
+            fn0: (x: V0) => T1[]): (x: V0) => T5[];
+        composeK<V0, T1, T2, T3, T4, T5, T6>(
+            fn5: (x: T5) => T6[],
+            fn4: (x: T4) => T5[],
+            fn3: (x: T3) => T4[],
+            fn2: (x: T2) => T3[],
+            fn1: (x: T1) => T2[],
+            fn0: (x: V0) => T1[]): (x: V0) => T6[];
 
         /**
-         * TODO composeP
+         * Performs right-to-left composition of one or more Promise-returning functions.
+         * All functions must be unary.
          */
+        composeP<V0, T1>(
+            fn0: (x0: V0) => Promise<T1>): (x0: V0) => Promise<T1>;
+        composeP<V0, T1, T2>(
+            fn1: (x: T1) => Promise<T2>,
+            fn0: (x0: V0) => Promise<T1>): (x0: V0) => Promise<T2>;
+        composeP<V0, T1, T2, T3>(
+            fn2: (x: T2) => Promise<T3>,
+            fn1: (x: T1) => Promise<T2>,
+            fn0: (x: V0) => Promise<T1>): (x: V0) => Promise<T3>;
+        composeP<V0, T1, T2, T3, T4>(
+            fn3: (x: T3) => Promise<T4>,
+            fn2: (x: T2) => Promise<T3>,
+            fn1: (x: T1) => Promise<T2>,
+            fn0: (x: V0) => Promise<T1>): (x: V0) => Promise<T4>;
+        composeP<V0, T1, T2, T3, T4, T5>(
+            fn4: (x: T4) => Promise<T5>,
+            fn3: (x: T3) => Promise<T4>,
+            fn2: (x: T2) => Promise<T3>,
+            fn1: (x: T1) => Promise<T2>,
+            fn0: (x: V0) => Promise<T1>):
+        (x: V0) => Promise<T5>;
+        composeP<V0, T1, T2, T3, T4, T5, T6>(
+            fn5: (x: T5) => Promise<T6>,
+            fn4: (x: T4) => Promise<T5>,
+            fn3: (x: T3) => Promise<T4>,
+            fn2: (x: T2) => Promise<T3>,
+            fn1: (x: T1) => Promise<T2>,
+            fn0: (x: V0) => Promise<T1>):
+        (x: V0) => Promise<T6>;
 
         /**
          * Returns a new list consisting of the elements of the first list followed by the elements
@@ -1501,6 +1561,148 @@ declare namespace R {
             fn8: (x: T8) => T9,
             fn9: (x: T9) => T10): (x0: V0, x1: V1, x2: V2) => T10;
 
+        /*
+         * Returns the left-to-right Kleisli composition of the provided functions, each of which must return a value of a type supported by chain.
+         * The typings currently support arrays only as return values.
+         * All functions need to be unary.
+         * R.pipeK(f, g, h) is equivalent to R.pipe(f, R.chain(g), R.chain(h)).
+         */
+        pipeK<V0, T1>(
+            fn0: (x0: V0) => T1[]): (x0: V0) => T1[];
+        pipeK<V0, T1, T2>(
+            fn0: (x0: V0) => T1[],
+            fn1: (x: T1) => T2[]): (x0: V0) => T2[];
+        pipeK<V0, T1, T2, T3>(
+            fn0: (x: V0) => T1[],
+            fn1: (x: T1) => T2[],
+            fn2: (x: T2) => T3[]): (x: V0) => T3[];
+        pipeK<V0, T1, T2, T3, T4>(
+            fn0: (x: V0) => T1[],
+            fn1: (x: T1) => T2[],
+            fn2: (x: T2) => T3[],
+            fn3: (x: T3) => T4[]): (x: V0) => T4[];
+        pipeK<V0, T1, T2, T3, T4, T5>(
+            fn0: (x: V0) => T1[],
+            fn1: (x: T1) => T2[],
+            fn2: (x: T2) => T3[],
+            fn3: (x: T3) => T4[],
+            fn4: (x: T4) => T5[]): (x: V0) => T5[];
+        pipeK<V0, T1, T2, T3, T4, T5, T6>(
+            fn0: (x: V0) => T1[],
+            fn1: (x: T1) => T2[],
+            fn2: (x: T2) => T3[],
+            fn3: (x: T3) => T4[],
+            fn4: (x: T4) => T5[],
+            fn5: (x: T5) => T6[]): (x: V0) => T6[];
+        pipeK<V0, T1, T2, T3, T4, T5, T6, T7>(
+            fn0: (x: V0) => T1[],
+            fn1: (x: T1) => T2[],
+            fn2: (x: T2) => T3[],
+            fn3: (x: T3) => T4[],
+            fn4: (x: T4) => T5[],
+            fn5: (x: T5) => T6[],
+            fn: (x: T6) => T7[]): (x: V0) => T7[];
+        pipeK<V0, T1, T2, T3, T4, T5, T6, T7, T8>(
+            fn0: (x: V0) => T1[],
+            fn1: (x: T1) => T2[],
+            fn2: (x: T2) => T3[],
+            fn3: (x: T3) => T4[],
+            fn4: (x: T4) => T5[],
+            fn5: (x: T5) => T6[],
+            fn6: (x: T6) => T7[],
+            fn: (x: T7) => T8[]): (x: V0) => T8[];
+        pipeK<V0, T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+            fn0: (x0: V0) => T1[],
+            fn1: (x: T1) => T2[],
+            fn2: (x: T2) => T3[],
+            fn3: (x: T3) => T4[],
+            fn4: (x: T4) => T5[],
+            fn5: (x: T5) => T6[],
+            fn6: (x: T6) => T7[],
+            fn7: (x: T7) => T8[],
+            fn8: (x: T8) => T9[]): (x0: V0) => T9[];
+        pipeK<V0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+            fn0: (x0: V0) => T1[],
+            fn1: (x: T1) => T2[],
+            fn2: (x: T2) => T3[],
+            fn3: (x: T3) => T4[],
+            fn4: (x: T4) => T5[],
+            fn5: (x: T5) => T6[],
+            fn6: (x: T6) => T7[],
+            fn7: (x: T7) => T8[],
+            fn8: (x: T8) => T9[],
+            fn9: (x: T9) => T10[]): (x0: V0) => T10[];
+
+        /*
+         * Performs left-to-right composition of one or more Promise-returning functions.
+         * All functions need to be unary.
+         */
+        pipeP<V0, T1>(
+            fn0: (x0: V0) => Promise<T1>): (x0: V0) => Promise<T1>;
+        pipeP<V0, T1, T2>(
+            fn0: (x0: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>): (x0: V0) => Promise<T2>;
+        pipeP<V0, T1, T2, T3>(
+            fn0: (x: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>,
+            fn2: (x: T2) => Promise<T3>): (x: V0) => Promise<T3>;
+        pipeP<V0, T1, T2, T3, T4>(
+            fn0: (x: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>,
+            fn2: (x: T2) => Promise<T3>,
+            fn3: (x: T3) => Promise<T4>): (x: V0) => Promise<T4>;
+        pipeP<V0, T1, T2, T3, T4, T5>(
+            fn0: (x: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>,
+            fn2: (x: T2) => Promise<T3>,
+            fn3: (x: T3) => Promise<T4>,
+            fn4: (x: T4) => Promise<T5>): (x: V0) => Promise<T5>;
+        pipeP<V0, T1, T2, T3, T4, T5, T6>(
+            fn0: (x: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>,
+            fn2: (x: T2) => Promise<T3>,
+            fn3: (x: T3) => Promise<T4>,
+            fn4: (x: T4) => Promise<T5>,
+            fn5: (x: T5) => Promise<T6>): (x: V0) => Promise<T6>;
+        pipeP<V0, T1, T2, T3, T4, T5, T6, T7>(
+            fn0: (x: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>,
+            fn2: (x: T2) => Promise<T3>,
+            fn3: (x: T3) => Promise<T4>,
+            fn4: (x: T4) => Promise<T5>,
+            fn5: (x: T5) => Promise<T6>,
+            fn: (x: T6) => Promise<T7>): (x: V0) => Promise<T7>;
+        pipeP<V0, T1, T2, T3, T4, T5, T6, T7, T8>(
+            fn0: (x: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>,
+            fn2: (x: T2) => Promise<T3>,
+            fn3: (x: T3) => Promise<T4>,
+            fn4: (x: T4) => Promise<T5>,
+            fn5: (x: T5) => Promise<T6>,
+            fn6: (x: T6) => Promise<T7>,
+            fn: (x: T7) => Promise<T8>): (x: V0) => Promise<T8>;
+        pipeP<V0, T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+            fn0: (x0: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>,
+            fn2: (x: T2) => Promise<T3>,
+            fn3: (x: T3) => Promise<T4>,
+            fn4: (x: T4) => Promise<T5>,
+            fn5: (x: T5) => Promise<T6>,
+            fn6: (x: T6) => Promise<T7>,
+            fn7: (x: T7) => Promise<T8>,
+            fn8: (x: T8) => Promise<T9>): (x0: V0) => Promise<T9>;
+        pipeP<V0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+            fn0: (x0: V0) => Promise<T1>,
+            fn1: (x: T1) => Promise<T2>,
+            fn2: (x: T2) => Promise<T3>,
+            fn3: (x: T3) => Promise<T4>,
+            fn4: (x: T4) => Promise<T5>,
+            fn5: (x: T5) => Promise<T6>,
+            fn6: (x: T6) => Promise<T7>,
+            fn7: (x: T7) => Promise<T8>,
+            fn8: (x: T8) => Promise<T9>,
+            fn9: (x: T9) => Promise<T10>): (x0: V0) => Promise<T10>;
+
         /**
          * Returns a new list by plucking the same named property off all objects in the list supplied.
          */

From c4493fb3a2fc0ba36c8c10d4be1454810353967e Mon Sep 17 00:00:00 2001
From: Kiyo Ichikawa <KIchikawa@summit.network>
Date: Tue, 12 Jun 2018 11:55:07 -0400
Subject: [PATCH 124/141] Adding cleanup and reset methods to type definition
 to help out with
 https://github.com/DefinitelyTyped/DefinitelyTyped/issues/26417. Also,
 cleanup and adding some other missing props/methods.

---
 types/browser-sync/browser-sync-tests.ts | 52 +++++++++++++++++++++
 types/browser-sync/index.d.ts            | 59 ++++++++++++++++++------
 2 files changed, 96 insertions(+), 15 deletions(-)

diff --git a/types/browser-sync/browser-sync-tests.ts b/types/browser-sync/browser-sync-tests.ts
index c63cb0c862..1c7e7e5996 100644
--- a/types/browser-sync/browser-sync-tests.ts
+++ b/types/browser-sync/browser-sync-tests.ts
@@ -1,4 +1,5 @@
 import browserSync = require("browser-sync");
+import { EventEmitter } from "events";
 
 (() => {
     //make sure that the interfaces are correctly exposed
@@ -391,6 +392,57 @@ bs.init({
 
 bs.reload();
 
+browserSync.use(
+    {
+        plugin: function(opts: object, bs: browserSync.BrowserSyncInstance) {
+            console.log(opts);
+        },
+        "plugin:name": "test"
+    },
+    { files: "*.css" }
+);
+
+browserSync.use({
+    plugin: function(opts: object, bs: browserSync.BrowserSyncInstance) {
+        console.log(bs.name);
+    }
+});
+
+browserSync(
+    {
+        server: {
+            baseDir: "test/fixtures"
+        },
+        logLevel: "silent",
+        open: false
+    }
+);
+
+var instanceName = "TestInstance";
+var namedInstance = browserSync.create(instanceName);
+namedInstance.init({
+    server: { index: "./app" },
+    https: true
+});
+
+console.log(namedInstance.getOption("https")); // Should output true.
+
+var existingInstance = browserSync.get(instanceName);
+
+browserSync.create("InstanceWithEventEmitter", new EventEmitter());
+
+// Should output something greater than 0.
+console.log(browserSync.instances.length);
+
+browserSync.reset();
+
+// Should output 0.
+console.log(browserSync.instances.length);
+
+var cleanupTestInstance = browserSync.create("CleanupTest");
+cleanupTestInstance.cleanup();
+console.log(cleanupTestInstance.active); // Should output false.
+
 function browserSyncInit(): browserSync.BrowserSyncInstance {
     var browser = browserSync.create();
     browser.init();
diff --git a/types/browser-sync/index.d.ts b/types/browser-sync/index.d.ts
index de0a457266..bcf0aa966e 100644
--- a/types/browser-sync/index.d.ts
+++ b/types/browser-sync/index.d.ts
@@ -456,11 +456,15 @@ declare namespace browserSync {
          * depending on your use-case.
          */
         (config?: Options, callback?: (err: Error, bs: object) => any): BrowserSyncInstance;
+        /**
+         * 
+         */
+        instances: Array<BrowserSyncInstance>;
         /**
          * Create a Browsersync instance
          * @param name an identifier that can used for retrieval later
          */
-        create(name?: string): BrowserSyncInstance;
+        create(name?: string, emitter?: NodeJS.EventEmitter): BrowserSyncInstance;
         /**
          * Get a single instance by name. This is useful if you have your build scripts in separate files
          * @param name the identifier used for retrieval
@@ -471,6 +475,11 @@ declare namespace browserSync {
          * @param name the name of the instance
          */
         has(name: string): boolean;
+        /**
+         * Reset the state of the module.
+         * (should only be needed for test environments)
+         */
+        reset(): void;
     }
 
     interface BrowserSyncInstance {
@@ -481,6 +490,24 @@ declare namespace browserSync {
          * depending on your use-case.
          */
         init(config?: Options, callback?: (err: Error, bs: object) => any): BrowserSyncInstance;
+        /**
+         * This method will close any running server, stop file watching & exit the current process.
+         */
+        exit(): void;
+        /**
+         * Helper method for browser notifications
+         * @param message Can be a simple message such as 'Connected' or HTML
+         * @param timeout How long the message will remain in the browser. @since 1.3.0
+         */
+        notify(message: string, timeout?: number): void;
+        /**
+         * Method to pause file change events
+         */
+        pause(): void;
+        /**
+         * Method to resume paused watchers
+         */
+        resume(): void;
         /**
          * Reload the browser
          * The reload method will inform all browsers about changed files and will either cause the browser
@@ -510,28 +537,30 @@ declare namespace browserSync {
          */
         stream(opts?: StreamOptions): NodeJS.ReadWriteStream;
         /**
-         * Helper method for browser notifications
-         * @param message Can be a simple message such as 'Connected' or HTML
-         * @param timeout How long the message will remain in the browser. @since 1.3.0
+         * Instance Cleanup.
          */
-        notify(message: string, timeout?: number): void;
+        cleanup(fn?: (error: NodeJS.ErrnoException, bs: BrowserSyncInstance) => void): void;
         /**
-         * This method will close any running server, stop file watching & exit the current process.
+         * Register a plugin.
+         * Must implement at least a 'plugin' property that returns
+         * callable function.
+         *
+         * @method use
+         * @param {object} module The object to be `required`.
+         * @param {object} options The 
+         * @param {any} cb A callback function that will return any errors.
          */
-        exit(): void;
+        use(module: { "plugin:name"?: string, plugin: (opts: object, bs: BrowserSyncInstance) => any }, options?: object, cb?: any): void;
+        /**
+         * Callback helper to examine what options have been set.
+         * @param {string} name The key to search options map for.
+         */
+        getOption(name: string): any;
         /**
          * Stand alone file-watcher. Use this along with Browsersync to create your own, minimal build system
          */
         watch(patterns: string, opts?: chokidar.WatchOptions, fn?: (event: string, file: fs.Stats) => any)
             : NodeJS.EventEmitter;
-        /**
-         * Method to pause file change events
-         */
-        pause(): void;
-        /**
-         * Method to resume paused watchers
-         */
-        resume(): void;
         /**
          * The internal Event Emitter used by the running Browsersync instance (if there is one). You can use
          * this to emit your own events, such as changed files, logging etc.

From dfb5e776726836c8167aa9c85b89baf661d3b8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miika=20H=C3=A4nninen?= <miika.hanninen@reaktor.com>
Date: Tue, 12 Jun 2018 19:58:53 +0300
Subject: [PATCH 125/141] Add tests for pipeK/pipeP/composeK/composeP

---
 types/ramda/ramda-tests.ts | 119 +++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)

diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 00591ebf94..32bae5fa0c 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -186,6 +186,68 @@ class F2 {
     const g_res: boolean = g([1, 2, 10, 13]);
 };
 
+/* composeK */
+() => {
+    const get = (prop: string) => (obj: any): any[] => {
+        const propVal = obj[prop];
+        if (propVal) {
+            return [propVal];
+        } else {
+            return [];
+        }
+    };
+
+    const getStateCode: (input: any) => any[] = R.composeK(
+        R.compose((val) => [val], R.toUpper),
+        get('state'),
+        get('address'),
+        get('user'),
+    );
+    getStateCode({ user: { address: { state: "ny" } } }); // => []
+    getStateCode({}); // => []
+
+    const nextThree = (num: number): number[] => ([num, num + 1, num + 2]);
+    const onlyOverNine = (num: number): number[] => num > 9 ? [num] : [];
+    const toString = (input: any): string[] => [`${input}`];
+    const split = (input: string): string[] => input.split('');
+
+    const composed: (num: number) => string[] = R.composeK(
+        split,
+        toString,
+        onlyOverNine,
+        nextThree,
+    );
+};
+
+/* composeP */
+() => {
+    interface User {
+        name: string;
+        followers: string[];
+    }
+    interface Db {
+        users: { [index: string]: User };
+    }
+    const db: Db = {
+        users: {
+            JOE: {
+                name: 'Joe',
+                followers: ['STEVE', 'SUZY']
+            }
+        }
+    };
+
+    // We'll pretend to do a db lookup which returns a promise
+    const lookupUser = (userId: string): Promise<User> => Promise.resolve(db.users[userId]);
+    const lookupFollowers = (user: User): Promise<string[]> => Promise.resolve(user.followers);
+    lookupUser('JOE').then(lookupFollowers);
+
+    //  followersForUser :: String -> Promise [UserId]
+    const followersForUser: (input: string) => Promise<string[]> = R.composeP(lookupFollowers, lookupUser);
+    followersForUser('JOE').then(followers => console.log('Followers:', followers));
+    // Followers: ["STEVE","SUZY"]
+};
+
 /* pipe */
 () => {
     const func: (x: number) => string = R.pipe(double, double, shout);
@@ -201,6 +263,63 @@ class F2 {
     const fr: number = f(3, 4); // -(3^4) + 1
 };
 
+/* pipeK */
+() => {
+    const parseJson = (input: string): any[] => {
+        try {
+            return [JSON.parse(input)];
+        } catch (e) {
+            return [];
+        }
+    };
+    const get = (prop: string) => (obj: any): any[] => {
+        const propVal = obj[prop];
+        if (propVal) {
+            return [propVal];
+        } else {
+            return [];
+        }
+    };
+
+    const getStateCode: (input: string) => string[] = R.pipeK(
+        parseJson,
+        get('user'),
+        get('address'),
+        get('state'),
+        R.compose((val) => [val], R.toUpper)
+    );
+
+    getStateCode('{"user":{"address":{"state":"ny"}}}');
+    // => Just('NY')
+    getStateCode('[Invalid JSON]');
+    // => Nothing()
+};
+
+/* pipeP */
+() => {
+    interface User {
+        followers: string[];
+        name: string;
+    }
+
+    const db = {
+        getUserById(userName: string): Promise<User> {
+            return Promise.resolve({
+                name: 'Jon',
+                followers: [
+                    'Samwell',
+                    'Edd',
+                    'Grenn',
+                ],
+            });
+        },
+        getFollowers(user: User): Promise<string[]> {
+            return Promise.resolve(user.followers);
+        },
+    };
+    const followersForUser: (userName: string) => Promise<string[]> = R.pipeP(db.getUserById, db.getFollowers);
+};
+
 () => {
     R.invoker(1, "slice")(6, "abcdefghijklm");
     R.invoker(2, "slice")(6)(8, "abcdefghijklm");

From f496c936e845e05556d1b65927434636acadae73 Mon Sep 17 00:00:00 2001
From: Sergei Butko <svbutko@hotmail.com>
Date: Tue, 12 Jun 2018 20:55:26 +0300
Subject: [PATCH 126/141] [react-navigation] Add DrawerActions

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index dd9efa0de4..f8bcac3fb3 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -341,6 +341,21 @@ export interface NavigationPushAction {
     key?: string;
 }
 
+export interface NavigationOpenDrawerAction {
+    key?: string;
+    type: 'Navigation/OPEN_DRAWER';
+}
+
+export interface NavigationCloseDrawerAction {
+    key?: string;
+    type: 'Navigation/CLOSE_DRAWER';
+}
+
+export interface NavigationToggleDrawerAction {
+    key?: string;
+    type: 'Navigation/TOGGLE_DRAWER';
+}
+
 export interface NavigationStackViewConfig {
   mode?: 'card' | 'modal';
   headerMode?: HeaderMode;
@@ -964,6 +979,19 @@ export namespace NavigationActions {
   ): NavigationPopToTopAction;
 }
 
+/**
+ * DrawerActions
+ */
+export namespace DrawerActions {
+    const OPEN_DRAWER: 'Navigation/OPEN_DRAWER';
+    const CLOSE_DRAWER: 'Navigation/CLOSE_DRAWER';
+    const TOGGLE_DRAWER: 'Navigation/TOGGLE_DRAWER';
+
+    function openDrawer(): NavigationOpenDrawerAction;
+    function closeDrawer(): NavigationCloseDrawerAction;
+    function toggleDrawer(): NavigationToggleDrawerAction;
+}
+
 /**
  * StackActions
  */

From 84f08b35e516efde3c8342ff7f1e723c31cc9a50 Mon Sep 17 00:00:00 2001
From: Roger Ostrander <atiaxi@gmail.com>
Date: Tue, 12 Jun 2018 14:00:29 -0400
Subject: [PATCH 127/141] Update rot-js typings to 0.6.5

---
 types/rot-js/index.d.ts      |  2 +-
 types/rot-js/rot-js-tests.ts | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/types/rot-js/index.d.ts b/types/rot-js/index.d.ts
index 44eeab7698..f2d0b45592 100644
--- a/types/rot-js/index.d.ts
+++ b/types/rot-js/index.d.ts
@@ -406,7 +406,7 @@ export class Display {
     clear(): void;
     computeSize(availWidth: number, availHeight: number): [number, number];
     computeFontSize(availWidth: number, availHeight: number): number;
-    draw(x: number, y: number, character: string | string[], fg?: string, bg?: string): void;
+    draw(x: number, y: number, character: string | string[], fg?: string | string[], bg?: string | string[]): void;
     drawText(x: number, y: number, text: string, maxWidth?: number): number;
     eventToPosition(e: UIEvent): [number, number] | number;
     getContainer(): Node;
diff --git a/types/rot-js/rot-js-tests.ts b/types/rot-js/rot-js-tests.ts
index 50ec56b947..36f6aa3576 100644
--- a/types/rot-js/rot-js-tests.ts
+++ b/types/rot-js/rot-js-tests.ts
@@ -324,6 +324,35 @@ tileSet.onload = () => {
     display.draw(2, 1, "#", "transparent", "rgba(250, 250, 0, 0.5)");
 };
 
+// Console display / graphical tiles / Colorized tile stacks
+
+tileSet = document.createElement("img");
+tileSet.src = "tiles.png";
+
+options = {
+    layout: "tile",
+    bg: "transparent",
+    tileWidth: 64,
+    tileHeight: 64,
+    tileSet,
+    tileColorize: true,
+    tileMap: {
+        "@": [0, 0],
+        "#": [0, 64]
+    },
+    width: 1,
+    height: 1
+};
+display = new ROT.Display(options);
+SHOW(display.getContainer());
+
+tileSet.onload = () => {
+    const ch = ["#", "@"];
+    const fg = ["rgba(255, 0, 0, 0.5)", "rgba(0, 0, 255, 0.5)"];
+    const bg = ["transparent", "transparent"];
+    display.draw(0, 0, ch, fg, bg);
+};
+
 // Map creation
 let map = new ROT.Map.Arena(3, 3);
 const userCallback = (x: number, y: number, value: number) => {

From 2dfb80b7d44b3932dcbb1a973b67ecff4fafd0a9 Mon Sep 17 00:00:00 2001
From: Nathan Bruer <thegreatall@gmail.com>
Date: Tue, 12 Jun 2018 11:18:46 -0700
Subject: [PATCH 128/141] [shallowequal] Compare callback allow undefined

https://github.com/dashed/shallowequal/blob/master/README.md explicit states that the callback may return undefined (void 0) if the user wishes to use the default compare.
---
 types/shallowequal/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/shallowequal/index.d.ts b/types/shallowequal/index.d.ts
index 29ffdab8f6..07d54d2b7f 100644
--- a/types/shallowequal/index.d.ts
+++ b/types/shallowequal/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function shallowEqual(objA: any, objB: any, compare?: (objA: any, objB: any, indexOrKey?: number | string) => boolean, compareContext?: any): boolean;
+declare function shallowEqual(objA: any, objB: any, compare?: (objA: any, objB: any, indexOrKey?: number | string) => boolean | undefined, compareContext?: any): boolean;
 
 declare namespace shallowEqual { }
 

From c406d22646f33a7f950bafd662e852d85a0a0f93 Mon Sep 17 00:00:00 2001
From: Nathan Bruer <nathanbruer@gmail.com>
Date: Tue, 12 Jun 2018 11:20:58 -0700
Subject: [PATCH 129/141] parentheses

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

diff --git a/types/shallowequal/index.d.ts b/types/shallowequal/index.d.ts
index 07d54d2b7f..af13b55eb4 100644
--- a/types/shallowequal/index.d.ts
+++ b/types/shallowequal/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function shallowEqual(objA: any, objB: any, compare?: (objA: any, objB: any, indexOrKey?: number | string) => boolean | undefined, compareContext?: any): boolean;
+declare function shallowEqual(objA: any, objB: any, compare?: (objA: any, objB: any, indexOrKey?: number | string) => (boolean | undefined), compareContext?: any): boolean;
 
 declare namespace shallowEqual { }
 

From 3f7fd95094878dd07a5069e8a44bfc6be0ac178c Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Tue, 12 Jun 2018 13:39:58 -0700
Subject: [PATCH 130/141] mainly adding overload signatures to method
 descriptions

---
 types/office-js/index.d.ts | 292 +++++++++++++++++++++++++++----------
 1 file changed, 211 insertions(+), 81 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index e4cb2bb0cc..5e15438be9 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -5847,7 +5847,7 @@ declare namespace Office {
          *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -5855,6 +5855,11 @@ declare namespace Office {
          * Minimum permission level: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * prependAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+         * prependAsync(data: string, callback: (result: AsyncResult) => void): void;
+         * prependAsync(data: string): void;
          *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -5868,7 +5873,7 @@ declare namespace Office {
          *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -5888,7 +5893,7 @@ declare namespace Office {
          *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -5906,7 +5911,7 @@ declare namespace Office {
          *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -5923,7 +5928,7 @@ declare namespace Office {
          *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
@@ -5935,6 +5940,11 @@ declare namespace Office {
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
          *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * setAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+         * setAsync(data: string, callback: (result: AsyncResult) => void): void;
+         * setAsync(data: string): void;         *
          *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -5948,7 +5958,7 @@ declare namespace Office {
          *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
@@ -5972,7 +5982,7 @@ declare namespace Office {
          *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
@@ -5994,7 +6004,7 @@ declare namespace Office {
          *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
@@ -6016,7 +6026,7 @@ declare namespace Office {
          *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -6028,7 +6038,12 @@ declare namespace Office {
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
          *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         *
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+         * setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
+         * setSelectedDataAsync(data: string): void;         *
+         *         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -6041,7 +6056,7 @@ declare namespace Office {
          *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -6065,7 +6080,7 @@ declare namespace Office {
          *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -6087,7 +6102,7 @@ declare namespace Office {
          *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
@@ -6406,6 +6421,9 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose
          * 
+         * In addition to this signature, the method also has the following signatures:
+         * getAsync(callback?: (result: AsyncResult) => void): void;
+         * 
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
@@ -6895,6 +6913,9 @@ declare namespace Office {
          *
          * Applicable Outlook mode: Compose or read
          * 
+         * In addition to this signature, the method also has the following signatures:
+         * addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
+         * 
          * @param eventType The event that should invoke the handler.
          * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -6955,6 +6976,9 @@ declare namespace Office {
          *
          * Applicable Outlook mode: Compose or read
          * 
+         * In addition to this signature, the method also has the following signatures:
+         * removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
+         * 
          * @param eventType The event that should invoke the handler.
          * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -7023,6 +7047,11 @@ declare namespace Office {
          * FileTypeNotSupported - The attachment has an extension that is not allowed.
          *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * addFileAttachmentAsync(uri: string, attachmentName: string): void;
+         * addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;
+         * addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult) => void): void;
          *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
@@ -7134,6 +7163,11 @@ declare namespace Office {
          * Errors:
          *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * addItemAttachmentAsync(itemId: any, attachmentName: string): void;
+         * addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;
+         * addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult) => void): void;
          *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
@@ -7256,7 +7290,34 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
          */
         getInitializationContextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
+                /**
+         * Asynchronously returns selected data from the subject or body of a message.
+         *
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         *
+         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @returns
+         * The selected data as a string with format determined by coercionType.
+         *
+         * @remarks
+         *
+         * Minimum permission level: ReadWriteItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * In addition to this signature, the method also has these signatures:
+         * getSelectedDataAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
+         *
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         */
+        getSelectedDataAsync(coercionType: CoercionType, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+         /**
          * Asynchronously returns selected data from the subject or body of a message.
          *
          * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
@@ -7278,30 +7339,6 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getSelectedDataAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
-        /**
-         * Asynchronously returns selected data from the subject or body of a message.
-         *
-         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
-         *
-         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @returns
-         * The selected data as a string with format determined by coercionType.
-         *
-         * @remarks
-         *
-         * Minimum permission level: ReadWriteItem
-         *
-         * Applicable Outlook mode: Compose
-         *
-         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
-         * @param options An object literal that contains one or more of the following properties.
-         *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
-         */
-        getSelectedDataAsync(coercionType: CoercionType, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Removes an attachment from a message or appointment.
          *
@@ -7316,6 +7353,11 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * removeAttachmentAsync(attachmentIndex: string): void;
+         * removeAttachmentAsync(attachmentIndex: string, options: AsyncContextOptions): void;
+         * removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult) => void): void;
          *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -7405,6 +7447,11 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * saveAsync(): void;
+         * saveAsync(options: AsyncContextOptions): void;
+         * saveAsync(callback: (result: AsyncResult) => void): void;
          *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -7509,8 +7556,13 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * setSelectedDataAsync(data: string): void;
+         * setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+         * setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
          *
-         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+        * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. If the field is an HTML editor, only the text data is inserted, even if the data is HTML. If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; if the field is text, then plain text is used.
@@ -7722,6 +7774,9 @@ declare namespace Office {
          *
          * Applicable Outlook mode: Read
          * 
+         * In addition to this signature, the method also has the following signatures:
+         * getInitializationContextAsync(callback?: (result: AsyncResult) => void): void;
+         * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
@@ -8123,6 +8178,10 @@ declare namespace Office {
          * Minimum permission level: ReadItem
          *
          * Applicable Outlook mode: Compose
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * getAsync(callback: (result: AsyncResult) => void): void;
+         * 
          */
         getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
@@ -8158,6 +8217,11 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          *
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * setAsync(location: string): void;
+         * setAsync(location: string, options: AsyncContextOptions): void;
+         * setAsync(location: string, callback: (result: AsyncResult) => void): void;
          */
         setAsync(location: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
@@ -8214,7 +8278,6 @@ declare namespace Office {
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
         setAsync(location: string, callback: (result: AsyncResult) => void): void;
-
     }
     /**
      * Provides access to the Outlook Add-in object model for Microsoft Outlook and Microsoft Outlook on the web.
@@ -8498,6 +8561,10 @@ declare namespace Office {
          * Minimum permission level: ReadItem
          *
          * Applicable Outlook mode: Compose and read
+         * 
+         * In addition to this signature, the method has the following signature:
+         * getCallbackTokenAsync(callback: (result: AsyncResult) => void): void;
+         * getCallbackTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
          *
          * @param options An object literal that contains one or more of the following properties.
          *        isRest: Determines if the token provided will be used for the Outlook REST APIs or Exchange Web Services. Default value is false.
@@ -8711,6 +8778,12 @@ declare namespace Office {
          * Minimum permission level: ReadItem
          *
          * Applicable Outlook mode: Compose or read
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * addAsync(key: string, JSONmessage: NotificationMessageDetails): void;
+         * addAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
+         * addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
+         * 
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
@@ -8773,6 +8846,9 @@ declare namespace Office {
          * Minimum permission level: ReadItem
          *
          * Applicable Outlook mode: Compose or read
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * getAllAsync(callback: (result: AsyncResult) => void): void;
          *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -8801,6 +8877,11 @@ declare namespace Office {
          * Minimum permission level: ReadItem
          *
          * Applicable Outlook mode: Compose or read
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * removeAsync(key: string): void;
+         * removeAsync(key: string, options: AsyncContextOptions): void;
+         * removeAsync(key: string, callback: (result: AsyncResult) => void): void;         * 
          *
          * @param key The key for the notification message to remove.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -8861,6 +8942,11 @@ declare namespace Office {
          * Minimum permission level: ReadItem
          *
          * Applicable Outlook mode: Compose or read
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;
+         * replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
+         * replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
          *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
@@ -8975,6 +9061,11 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * addAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
+         * addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
+         * addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
          *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -9054,7 +9145,26 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
          */
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
-
+        /**
+         * Gets a recipient list for an appointment or message.
+         *
+         * When the call completes, the asyncResult.value property will contain an array of EmailAddressDetails objects.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * getAsync(callback: (result: AsyncResult) => void): void;
+         *
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         */
+        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Gets a recipient list for an appointment or message.
          *
@@ -9070,23 +9180,6 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
-        /**
-         * Gets a recipient list for an appointment or message.
-         *
-         * When the call completes, the asyncResult.value property will contain an array of EmailAddressDetails objects.
-         *
-         * [Api set: Mailbox 1.1]
-         *
-         * @remarks
-         * Minimum permission level: ReadItem
-         *
-         * Applicable Outlook mode: Compose
-         *
-         * @param options An object literal that contains one or more of the following properties.
-         *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
-         */
-        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Sets a recipient list for an appointment or message.
          *
@@ -9108,6 +9201,11 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * setAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
+         * setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
+         * setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
          *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -9282,6 +9380,9 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          * 
+         * In addition to the main signature, this method also has these signatures:
+         * getAsync(callback?: (result: AsyncResult) => void): void;
+         * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
@@ -9320,6 +9421,9 @@ declare namespace Office {
          * 
          * Errors: InvalidEndTime - The appointment end time is before its start time.
          * 
+         * In addition to the main signature, this method also has these signatures:
+         * setAsync(recurrencePattern: Recurrence, callback?: (result: AsyncResult) => void): void;
+         * 
          * @param recurrencePattern A recurrence object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -9613,12 +9717,15 @@ declare namespace Office {
          * 
          * Errors: Invalid date format - The date is not in an acceptable format.
          * 
+         * In addition to the main signature, this method also has these signatures:
+         * setEndDate(date: string): void;
+         * Where date is the end date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
+         * 
          * @param year The year value of the end date.
          * @param month The month value of the end date. Valid range is 0-11 where 0 represents the 1st month and 11 represents the 12th month.
          * @param day The day value of the end date.
          */
         setEndDate(year: number, month: number, day: number): void;
-
         /**
          * Sets the end date of a recurring appointment series.
          * 
@@ -9634,7 +9741,6 @@ declare namespace Office {
          * @param date End date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
          */
         setEndDate(date: string): void;
-
         /**
          * Sets the start date of a recurring appointment series.
          * 
@@ -9647,6 +9753,10 @@ declare namespace Office {
          * 
          * Errors: Invalid date format - The date is not in an acceptable format.
          * 
+         * In addition to the main signature, this method also has these signatures:
+         * setStartDate(date: string): void;
+         * Where date is the start date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
+         *  
          * @param year The year value of the start date.
          * @param month The month value of the start date. Valid range is 0-11 where 0 represents the 1st month and 11 represents the 12th month.
          * @param day The day value of the start date.
@@ -9681,6 +9791,10 @@ declare namespace Office {
          * 
          * Errors: Invalid time format - The time is not in an acceptable format.
          * 
+         * In addition to the main signature, this method also has these signatures:
+         * setStartTime(time: string): void;
+         * Where time is the start time of all instances represented by standard datetime string format: "THH:mm:ss:mmm". 
+         * 
          * @param hours The hour value of the start time. Valid range: 0-24.
          * @param minutes The minute value of the start time. Valid range: 0-59.
          */
@@ -9714,6 +9828,26 @@ declare namespace Office {
      * Applicable Outlook mode: Compose
      */
     interface Subject {
+        /**
+         * Gets the subject of an appointment or message.
+         *
+         * The getAsync method starts an asynchronous call to the Exchange server to get the subject of an appointment or message.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * getAsync(callback: (result: AsyncResult) => void): void;
+         *
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         */
+        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Gets the subject of an appointment or message.
          * The getAsync method starts an asynchronous call to the Exchange server to get the subject of an appointment or message.
@@ -9728,23 +9862,6 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
-        /**
-         * Gets the subject of an appointment or message.
-         *
-         * The getAsync method starts an asynchronous call to the Exchange server to get the subject of an appointment or message.
-         *
-         * [Api set: Mailbox 1.1]
-         *
-         * @remarks
-         * Minimum permission level: ReadItem
-         *
-         * Applicable Outlook mode: Compose
-         *
-         * @param options An object literal that contains one or more of the following properties.
-         *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
-         */
-        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Sets the subject of an appointment or message.
          *
@@ -9758,6 +9875,11 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          *
          * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * setAsync(subject: string): void;
+         * setAsync(subject: string, options: AsyncContextOptions): void;
+         * setAsync(subject: string, callback: (result: AsyncResult) => void): void;
          *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          * @param options An object literal that contains one or more of the following properties.
@@ -9865,10 +9987,15 @@ declare namespace Office {
          * Minimum permission level: ReadItem
          *
          * Applicable Outlook mode: Compose
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * getAsync(callback: (result: AsyncResult) => void): void;
          *
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
-        getAsync(callback: (result: AsyncResult) => void): void;
+        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Gets the start or end time of an appointment.
          *
@@ -9881,11 +10008,9 @@ declare namespace Office {
          *
          * Applicable Outlook mode: Compose
          *
-         * @param options An object literal that contains one or more of the following properties.
-         *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
-        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Sets the start or end time of an appointment.
          *
@@ -9901,6 +10026,11 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          *
          * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * setAsync(dateTime: Date): void;
+         * setAsync(dateTime: Date, options: AsyncContextOptions): void;
+         * setAsync(dateTime: Date, callback: (result: AsyncResult) => void): void;
          *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          * @param options An object literal that contains one or more of the following properties.

From 6b9dea6b74dfa831dc28d755cec1be6d38c4688e Mon Sep 17 00:00:00 2001
From: Craig Bruce <“craigrbruce@gmail.com”>
Date: Wed, 13 Jun 2018 11:36:31 +1000
Subject: [PATCH 131/141] Add new property `breakId` to `BreaksEvent` as per
 the latest Chromecast documentation

https://developers.google.com/cast/docs/reference/caf_receiver/cast.framework.events.BreaksEvent
https://developers.google.com/cast/docs/release-notes
---
 .../cast.framework.events.d.ts                |  8 +++++++-
 .../chromecast-caf-receiver-tests.ts          | 19 ++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/types/chromecast-caf-receiver/cast.framework.events.d.ts b/types/chromecast-caf-receiver/cast.framework.events.d.ts
index 0c69727a05..03b70ca459 100644
--- a/types/chromecast-caf-receiver/cast.framework.events.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.events.d.ts
@@ -367,9 +367,15 @@ declare namespace cast.framework.events {
             total?: number,
             whenSkippable?: number,
             endedReason?: EndedReason,
-            breakClipId?: string
+            breakClipId?: string,
+            breakId?: string
         );
 
+        /**
+         * The break's id. Refer to Break.id
+         */
+        breakId?: string;
+
         /**
          * The break clip's id. Refer to BreakClip.id
          */
diff --git a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
index a75834b0a8..08ce57cf86 100644
--- a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
+++ b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
@@ -8,7 +8,8 @@ import {
 } from "chromecast-caf-receiver/cast.framework.system";
 import {
     RequestEvent,
-    Event
+    Event,
+    BreaksEvent
 } from "chromecast-caf-receiver/cast.framework.events";
 import {
     QueueBase,
@@ -29,12 +30,16 @@ import {
     MediaMetadata
 } from "chromecast-caf-receiver/cast.framework.messages";
 
+const breaksEvent = new BreaksEvent('BREAK_STARTED');
+breaksEvent.breakId = 'some-break-id';
+breaksEvent.breakClipId = 'some-break-clip-id';
+
 const track = new Track(1, "TEXT");
 const breakClip = new BreakClip("id");
 const adBreak = new Break("id", ["id"], 1);
 const rEvent = new RequestEvent("BITRATE_CHANGED", { requestId: 2 });
 const pManager = new PlayerManager();
-pManager.addEventListener("STALLED", () => {});
+pManager.addEventListener("STALLED", () => { });
 const ttManager = new TextTracksManager();
 const qManager = new QueueManager();
 const qBase = new QueueBase();
@@ -47,10 +52,10 @@ const breakManager: BreakManager = {
     getBreakClips: () => [breakClip],
     getBreaks: () => [adBreak],
     getPlayWatchedBreak: () => true,
-    setBreakClipLoadInterceptor: () => {},
-    setBreakSeekInterceptor: () => {},
-    setPlayWatchedBreak: () => {},
-    setVastTrackingInterceptor: () => {}
+    setBreakClipLoadInterceptor: () => { },
+    setBreakSeekInterceptor: () => { },
+    setPlayWatchedBreak: () => { },
+    setVastTrackingInterceptor: () => { }
 };
 
 const lrd: LoadRequestData = {
@@ -103,4 +108,4 @@ const pData: PlayerData = {
     whenSkippable: 321
 };
 const binder = new PlayerDataBinder(pData);
-binder.addEventListener("ANY_CHANGE", e => {});
+binder.addEventListener("ANY_CHANGE", e => { });

From 7a5705468862b6d4402613a0f3cab8ad73310b04 Mon Sep 17 00:00:00 2001
From: austaras <austaras@outlook.com>
Date: Wed, 13 Jun 2018 11:40:03 +0800
Subject: [PATCH 132/141] fix error and update ethereumjs-util

---
 types/ethereumjs-util/index.d.ts | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/types/ethereumjs-util/index.d.ts b/types/ethereumjs-util/index.d.ts
index eb47d3a6a9..af859c72fc 100644
--- a/types/ethereumjs-util/index.d.ts
+++ b/types/ethereumjs-util/index.d.ts
@@ -5,11 +5,11 @@
 
 /// <reference types="node" />
 
-// TODO: import types for [`BN`](https://github.com/indutny/bn.js)
-// TODO: MAX_INTEGER as type of BN
 // TODO: import types for [`rlp`](https://github.com/ethereumjs/rlp)
 // TODO: import types for [`secp256k1`](https://github.com/cryptocoinjs/secp256k1-node/)
 
+import BN = require("bn.js");
+
 export const SHA3_NULL_S: string;
 
 export const SHA3_RLP_ARRAY_S: string;
@@ -18,13 +18,11 @@ export const SHA3_RLP_S: string;
 
 export function addHexPrefix(str: string): string;
 
-export function arrayContainsArray(superset: any, subset: any, some: any): any;
-
-export function baToJSON(ba: Buffer | Uint8Array | string[]): Buffer | Uint8Array | string[];
+export function baToJSON(ba: Buffer | Uint8Array | string[]): Buffer | Uint8Array | string[] | null;
 
 export function bufferToHex(buf: Buffer | Uint8Array): string;
 
-export function bufferToInt(buf: Buffer | Uint8Array): string;
+export function bufferToInt(buf: Buffer | Uint8Array): number;
 
 export function defineProperties(self: {[k: string]: any}, fields: string[], data: {[k: string]: any}): {[k: string]: any};
 
@@ -34,7 +32,7 @@ export function ecsign(msgHash: Buffer | Uint8Array, privateKey: Buffer | Uint8A
 
 export function fromRpcSig(sig: string): {[k: string]: any};
 
-export function fromSigned(num: Buffer | Uint8Array): any;
+export function fromSigned(num: Buffer | Uint8Array): BN;
 
 export function generateAddress(from: Buffer | Uint8Array, nonce: Buffer | Uint8Array): Buffer | Uint8Array;
 
@@ -42,6 +40,8 @@ export function hashPersonalMessage(message: string): Buffer | Uint8Array;
 
 export function importPublic(publicKey: Buffer | Uint8Array): Buffer | Uint8Array;
 
+export function isPrecompiled(address: Buffer | Uint8Array): boolean;
+
 export function isValidAddress(address: string): boolean;
 
 export function isValidChecksumAddress(address: Buffer | Uint8Array): boolean;
@@ -52,11 +52,17 @@ export function isValidPublic(publicKey: Buffer | Uint8Array, sanitize?: boolean
 
 export function isValidSignature(v: Buffer | Uint8Array, r: Buffer | Uint8Array, s: Buffer | Uint8Array, homestead?: boolean): boolean;
 
+export function isZeroAddress(address: string): boolean;
+
+export function keccak(a: Buffer | Uint8Array | any[] | string | number, bits?: number): Buffer | Uint8Array;
+
+export function keccak256(a: Buffer | Uint8Array | any[] | string | number): Buffer | Uint8Array;
+
 export function privateToAddress(privateKey: Buffer | Uint8Array): Buffer | Uint8Array;
 
 export function privateToPublic(privateKey: Buffer | Uint8Array): Buffer | Uint8Array;
 
-export function pubToAddress(pubKey: Buffer | Uint8Array, sanitize: boolean): Buffer | Uint8Array;
+export function pubToAddress(pubKey: Buffer | Uint8Array, sanitize?: boolean): Buffer | Uint8Array;
 
 export function ripemd160(a: Buffer | Uint8Array | any[] | string | number, padded: boolean): Buffer | Uint8Array;
 
@@ -76,8 +82,10 @@ export function toChecksumAddress(address: string): string;
 
 export function toRpcSig(v: number, r: Buffer | Uint8Array, s: Buffer | Uint8Array): string;
 
-export function toUnsigned(num: any): Buffer | Uint8Array;
+export function toUnsigned(num: BN): Buffer | Uint8Array;
 
 export function unpad<T extends Buffer | Uint8Array | any[] | string>(a: T): T;
 
 export function zeros(bytes: number): Buffer | Uint8Array;
+
+export function zeroAddress(): string;

From f8ad00e5ff76b72b72ec94b8fcdb31a63d3f50d1 Mon Sep 17 00:00:00 2001
From: austaras <austaras@outlook.com>
Date: Wed, 13 Jun 2018 11:42:48 +0800
Subject: [PATCH 133/141] modify version

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

diff --git a/types/ethereumjs-util/index.d.ts b/types/ethereumjs-util/index.d.ts
index af859c72fc..36b76c47f0 100644
--- a/types/ethereumjs-util/index.d.ts
+++ b/types/ethereumjs-util/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ethereumjs-util 5.1
+// Type definitions for ethereumjs-util 5.2
 // Project: https://github.com/ethereumjs/ethereumjs-util#readme
 // Definitions by: Juan J. Jimenez-Anca <https://github.com/cortopy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 9cd49e10aaa9d3e4ca4337a0cc35f999f0f0e6b2 Mon Sep 17 00:00:00 2001
From: austaras <austaras@outlook.com>
Date: Wed, 13 Jun 2018 12:43:47 +0800
Subject: [PATCH 134/141] modify hashPersonalMessage param type

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

diff --git a/types/ethereumjs-util/index.d.ts b/types/ethereumjs-util/index.d.ts
index 36b76c47f0..c5ae356f5b 100644
--- a/types/ethereumjs-util/index.d.ts
+++ b/types/ethereumjs-util/index.d.ts
@@ -36,7 +36,7 @@ export function fromSigned(num: Buffer | Uint8Array): BN;
 
 export function generateAddress(from: Buffer | Uint8Array, nonce: Buffer | Uint8Array): Buffer | Uint8Array;
 
-export function hashPersonalMessage(message: string): Buffer | Uint8Array;
+export function hashPersonalMessage(message: Buffer | Uint8Array | any[]): Buffer | Uint8Array;
 
 export function importPublic(publicKey: Buffer | Uint8Array): Buffer | Uint8Array;
 

From df9121a08e5c42125f9c07e760647855d671b6c3 Mon Sep 17 00:00:00 2001
From: Eyal Lapid <eyall@proftit.com>
Date: Wed, 13 Jun 2018 09:02:41 +0300
Subject: [PATCH 135/141] Add methods definitions for sinon-chai v3.2. Upgrade
 major version.

---
 types/sinon-chai/index.d.ts             | 24 ++++++-
 types/sinon-chai/sinon-chai-tests.ts    |  4 ++
 types/sinon-chai/v2/index.d.ts          | 89 +++++++++++++++++++++++++
 types/sinon-chai/v2/sinon-chai-tests.ts | 39 +++++++++++
 types/sinon-chai/v2/tsconfig.json       | 26 ++++++++
 types/sinon-chai/v2/tslint.json         | 79 ++++++++++++++++++++++
 6 files changed, 259 insertions(+), 2 deletions(-)
 create mode 100644 types/sinon-chai/v2/index.d.ts
 create mode 100644 types/sinon-chai/v2/sinon-chai-tests.ts
 create mode 100644 types/sinon-chai/v2/tsconfig.json
 create mode 100644 types/sinon-chai/v2/tslint.json

diff --git a/types/sinon-chai/index.d.ts b/types/sinon-chai/index.d.ts
index cff6d0b3a2..27c5ba20c1 100644
--- a/types/sinon-chai/index.d.ts
+++ b/types/sinon-chai/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for sinon-chai 2.7.0
+// Type definitions for sinon-chai 3.2.0
 // Project: https://github.com/domenic/sinon-chai
-// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>, Jed Mao <https://github.com/jedmao>
+// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid> 
+//                 Jed Mao <https://github.com/jedmao>
+//                 Eyal Lapid <https://github.com/elpdpt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -46,6 +48,16 @@ declare global {
              * Returns true if the spy was called after anotherSpy.
              */
             calledAfter(anotherSpy: Sinon.SinonSpy): Assertion;
+            /**
+             * Returns true if spy was called before anotherSpy, and no spy calls occurred 
+             * between spy and anotherSpy.
+             */
+            calledImmediatelyBefore(anotherSpy: Sinon.SinonSpy): Assertion;
+            /**
+             * Returns true if spy was called after anotherSpy, and no spy calls occurred 
+             * between anotherSpy and spy.
+             */
+            calledImmediatelyAfter(anotherSpy: Sinon.SinonSpy): Assertion;
             /**
              * Returns true if spy/stub was called with the new operator. Beware that
              * this is inferred based on the value of the this object and the spy
@@ -61,10 +73,18 @@ declare global {
              * Returns true if call received provided arguments (and possibly others).
              */
             calledWith(...args: any[]): Assertion;
+            /**
+             * Returns true if spy was called at exactly once with the provided arguments.
+             */
+            calledOnceWith(...args: any[]): Assertion;
             /**
              * Returns true if call received provided arguments and no others.
              */
             calledWithExactly(...args: any[]): Assertion;
+            /**
+             * Returns true if spy was called exactly once with the provided arguments and no others.
+             */
+            calledOnceWithExactly(...args: any[]): Assertion;
             /**
              * Returns true if call received matching arguments (and possibly others).
              * This behaves the same as spyCall.calledWith(sinon.match(arg1), sinon.match(arg2), ...).
diff --git a/types/sinon-chai/sinon-chai-tests.ts b/types/sinon-chai/sinon-chai-tests.ts
index 70e2aa750c..23a99fada8 100644
--- a/types/sinon-chai/sinon-chai-tests.ts
+++ b/types/sinon-chai/sinon-chai-tests.ts
@@ -17,14 +17,18 @@ function test() {
     expect(spy).to.have.been.calledTwice;
     expect(spy).to.have.been.calledThrice;
     expect(spy).to.have.been.calledBefore(anotherSpy);
+    expect(spy).to.have.been.calledImmediatelyBefore(anotherSpy);
     expect(spy).to.have.been.calledAfter(anotherSpy);
+    expect(spy).to.have.been.calledImmediatelyAfter(anotherSpy);
     expect(spy).to.have.been.calledWithNew;
     expect(spy).to.always.have.been.calledWithNew;
     expect(spy).to.have.been.calledOn(context);
     expect(spy).to.always.have.been.calledOn(context);
     expect(spy).to.have.been.calledWith('foo', 'bar');
+    expect(spy).to.have.been.calledOnceWith('foo', 'bar');
     expect(spy).to.always.have.been.calledWith('foo', 'bar');
     expect(spy).to.have.been.calledWithExactly('foo', 'bar');
+    expect(spy).to.have.been.calledOnceWithExactly('foo', 'bar');
     expect(spy).to.always.have.been.calledWithExactly('foo', 'bar');
     expect(spy).to.have.been.calledWithMatch(match);
     expect(spy).to.always.have.been.calledWithMatch(match);
diff --git a/types/sinon-chai/v2/index.d.ts b/types/sinon-chai/v2/index.d.ts
new file mode 100644
index 0000000000..cff6d0b3a2
--- /dev/null
+++ b/types/sinon-chai/v2/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for sinon-chai 2.7.0
+// Project: https://github.com/domenic/sinon-chai
+// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>, Jed Mao <https://github.com/jedmao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="chai" />
+/// <reference types="sinon" />
+
+import * as Sinon from 'sinon';
+
+declare global {
+
+    export namespace Chai {
+
+        interface LanguageChains {
+            always: Assertion;
+        }
+
+        interface Assertion {
+            /**
+             * true if the spy was called at least once.
+             */
+            called: Assertion;
+            /**
+             * @param count The number of recorded calls.
+             */
+            callCount(count: number): Assertion;
+            /**
+             * true if the spy was called exactly once.
+             */
+            calledOnce: Assertion;
+            /**
+             * true if the spy was called exactly twice.
+             */
+            calledTwice: Assertion;
+            /**
+             * true if the spy was called exactly thrice.
+             */
+            calledThrice: Assertion;
+            /**
+             * Returns true if the spy was called before anotherSpy.
+             */
+            calledBefore(anotherSpy: Sinon.SinonSpy): Assertion;
+            /**
+             * Returns true if the spy was called after anotherSpy.
+             */
+            calledAfter(anotherSpy: Sinon.SinonSpy): Assertion;
+            /**
+             * Returns true if spy/stub was called with the new operator. Beware that
+             * this is inferred based on the value of the this object and the spy
+             * function's prototype, so it may give false positives if you actively
+             * return the right kind of object.
+             */
+            calledWithNew: Assertion;
+            /**
+             * Returns true if context was this for this call.
+             */
+            calledOn(context: any): Assertion;
+            /**
+             * Returns true if call received provided arguments (and possibly others).
+             */
+            calledWith(...args: any[]): Assertion;
+            /**
+             * Returns true if call received provided arguments and no others.
+             */
+            calledWithExactly(...args: any[]): Assertion;
+            /**
+             * Returns true if call received matching arguments (and possibly others).
+             * This behaves the same as spyCall.calledWith(sinon.match(arg1), sinon.match(arg2), ...).
+             */
+            calledWithMatch(...args: any[]): Assertion;
+            /**
+             * Returns true if spy returned the provided value at least once. Uses
+             * deep comparison for objects and arrays. Use spy.returned(sinon.match.same(obj))
+             * for strict comparison (see matchers).
+             */
+            returned(obj: any): Assertion;
+            /**
+             * Returns true if spy threw the provided exception object at least once.
+             */
+            thrown(obj?: Error | typeof Error | string): Assertion;
+        }
+    }
+}
+
+declare function sinonChai(chai: any, utils: any): void;
+declare namespace sinonChai { }
+export = sinonChai;
diff --git a/types/sinon-chai/v2/sinon-chai-tests.ts b/types/sinon-chai/v2/sinon-chai-tests.ts
new file mode 100644
index 0000000000..70e2aa750c
--- /dev/null
+++ b/types/sinon-chai/v2/sinon-chai-tests.ts
@@ -0,0 +1,39 @@
+import Sinon = require('sinon');
+
+import chai = require('chai');
+import sinonChai = require('sinon-chai');
+
+chai.use(sinonChai);
+var expect = chai.expect;
+declare var spy: Sinon.SinonSpy;
+declare var anotherSpy: Sinon.SinonSpy;
+declare var context: {};
+declare var match: RegExp;
+
+// ReSharper disable WrongExpressionStatement
+function test() {
+    expect(spy).to.have.been.called;
+    expect(spy).to.have.been.calledOnce;
+    expect(spy).to.have.been.calledTwice;
+    expect(spy).to.have.been.calledThrice;
+    expect(spy).to.have.been.calledBefore(anotherSpy);
+    expect(spy).to.have.been.calledAfter(anotherSpy);
+    expect(spy).to.have.been.calledWithNew;
+    expect(spy).to.always.have.been.calledWithNew;
+    expect(spy).to.have.been.calledOn(context);
+    expect(spy).to.always.have.been.calledOn(context);
+    expect(spy).to.have.been.calledWith('foo', 'bar');
+    expect(spy).to.always.have.been.calledWith('foo', 'bar');
+    expect(spy).to.have.been.calledWithExactly('foo', 'bar');
+    expect(spy).to.always.have.been.calledWithExactly('foo', 'bar');
+    expect(spy).to.have.been.calledWithMatch(match);
+    expect(spy).to.always.have.been.calledWithMatch(match);
+    expect(spy).to.have.returned(1);
+    expect(spy).to.have.always.returned(1);
+    expect(spy).to.have.thrown(new Error());
+    expect(spy).to.have.thrown(Error);
+    expect(spy).to.have.thrown('an error');
+    expect(spy).to.have.always.thrown(new Error());
+    expect(spy).to.have.always.thrown(Error);
+    expect(spy).to.have.always.thrown('an error');
+}
diff --git a/types/sinon-chai/v2/tsconfig.json b/types/sinon-chai/v2/tsconfig.json
new file mode 100644
index 0000000000..69be55da5b
--- /dev/null
+++ b/types/sinon-chai/v2/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+          "sinon-chai": [ "sinon-chai/v2" ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "sinon-chai-tests.ts"
+    ]
+}
diff --git a/types/sinon-chai/v2/tslint.json b/types/sinon-chai/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/sinon-chai/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From d4da3f6afad67cdeadab86d98c6a8de3bfe2ac22 Mon Sep 17 00:00:00 2001
From: Ethan Resnick <ethan.resnick@gmail.com>
Date: Wed, 13 Jun 2018 03:28:53 -0400
Subject: [PATCH 136/141] fix(mongoose): Connection's aren't truly thenable

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index ec309669bc..94c291bb7e 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mongoose 5.0.1
+// Type definitions for Mongoose 5.0.2
 // Project: http://mongoosejs.com/
 // Definitions by: horiuchi <https://github.com/horiuchi>
 //                 sindrenm <https://github.com/sindrenm>
@@ -97,7 +97,10 @@ declare module "mongoose" {
   export function createConnection(): Connection;
   export function createConnection(uri: string,
     options?: ConnectionOptions
-  ): Connection;
+  ): Connection & {
+    then: Promise<Connection>["then"];
+    catch: Promise<Connection>["catch"];
+  };
 
   /**
    * Disconnects all connections.
@@ -403,9 +406,6 @@ declare module "mongoose" {
 
     /** Expose the possible connection states. */
     static STATES: any;
-
-    then: Promise<Connection>["then"];
-    catch: Promise<Connection>["catch"];
   }
 
   /*
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index 3ba415d909..3ba9dcce6b 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -131,6 +131,13 @@ mongoose.Connection.STATES.hasOwnProperty('');
 conn1.on('data', cb);
 conn1.addListener('close', cb);
 
+// The connection returned by useDb is *not* thenable.
+// From https://github.com/DefinitelyTyped/DefinitelyTyped/pull/26057#issuecomment-396150819
+const getDB = async (tenant: string)=> {
+  return conn1.useDb(tenant);
+};
+
+
 /*
  * section error/validation.js
  * http://mongoosejs.com/docs/api.html#error-validation-js

From 95be28fed54e4e47ba3e42a9c563f6bab23d2b32 Mon Sep 17 00:00:00 2001
From: Markus Fasselt <markus.fasselt@gmail.com>
Date: Tue, 12 Jun 2018 22:28:11 +0200
Subject: [PATCH 137/141] Update OwlCarousel2 typings

I updated the options according to https://owlcarousel2.github.io/OwlCarousel2/docs/api-options.html.

- added `lazyLoadEager` and removed `lazyContent` ([source](https://github.com/OwlCarousel2/OwlCarousel2/commit/44571f95d5850d19d27fa634d443d9215eae7699#diff-16d5a8e7f1181df10837309167888eed))
- renamed `dotData` to `dotsData` ([source](https://github.com/OwlCarousel2/OwlCarousel2/commit/1915cb0d415005f0df118919d1e433221e36a764#diff-16d5a8e7f1181df10837309167888eed))
- added checkVisible ([source](https://github.com/OwlCarousel2/OwlCarousel2/commit/e5ea9a506994c18ea2b0575df20bc6dfeb79feb0#diff-16d5a8e7f1181df10837309167888eed))
- added `slideTransition` ([source](https://github.com/OwlCarousel2/OwlCarousel2/commit/40e28e09e44dfee4cf6d9c5e31bf29770ea0ec20#diff-16d5a8e7f1181df10837309167888eed))
---
 types/owl.carousel/index.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/owl.carousel/index.d.ts b/types/owl.carousel/index.d.ts
index 0295b3fe5b..b1b093ef77 100644
--- a/types/owl.carousel/index.d.ts
+++ b/types/owl.carousel/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for owl.carousel 2.2
+// Type definitions for owl.carousel 2.3
 // Project: https://github.com/OwlCarousel2/OwlCarousel2
 // Definitions by: Ismael Gorissen <https://github.com/igorissen>
 //                 Kenneth Ceyer <https://github.com/KennethanCeyer>
@@ -31,9 +31,9 @@ declare namespace OwlCarousel {
         slideBy?: number | string;
         dots?: boolean;
         dotsEach?: number | boolean;
-        dotData?: boolean;
+        dotsData?: boolean;
         lazyLoad?: boolean;
-        lazyContent?: boolean;
+        lazyLoadEager?: number;
         autoplay?: boolean;
         autoplayTimeout?: number;
         autoplayHoverPause?: boolean;
@@ -59,6 +59,8 @@ declare namespace OwlCarousel {
         stageElement?: string;
         navContainer?: string | boolean;
         dotsContainer?: string | boolean;
+        checkVisible?: boolean;
+        slideTransition?: string;
         // CLASSES
         refreshClass?: string;
         loadingClass?: string;

From 4b2b0cf993ad5c7446067b7f2e71fc220428409c Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <deb2001-github@yahoo.de>
Date: Tue, 12 Jun 2018 23:59:57 +0200
Subject: [PATCH 138/141] [node] Correct type of incoming http2 ':status'
 header

---
 types/node/index.d.ts    | 49 +++++++++++++++++++++-------------------
 types/node/node-tests.ts |  4 +++-
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 070c668e11..4d00e2acf2 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6849,12 +6849,15 @@ declare module "http2" {
     import { IncomingHttpHeaders as Http1IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
     export { OutgoingHttpHeaders } from "http";
 
+    export interface IncomingHttpStatusHeader {
+        ":status"?: number;
+    }
+
     export interface IncomingHttpHeaders extends Http1IncomingHttpHeaders {
-        ':path'?: string;
-        ':method'?: string;
-        ':status'?: string;
-        ':authority'?: string;
-        ':scheme'?: string;
+        ":path"?: string;
+        ":method"?: string;
+        ":authority"?: string;
+        ":scheme"?: string;
     }
 
     // Http2Stream
@@ -7001,34 +7004,34 @@ declare module "http2" {
 
     export interface ClientHttp2Stream extends Http2Stream {
         addListener(event: string, listener: (...args: any[]) => void): this;
-        addListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
         addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        addListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
 
         emit(event: string | symbol, ...args: any[]): boolean;
-        emit(event: "headers", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "headers", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
         emit(event: "push", headers: IncomingHttpHeaders, flags: number): boolean;
-        emit(event: "response", headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "response", headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
-        on(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
         on(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        on(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
 
         once(event: string, listener: (...args: any[]) => void): this;
-        once(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
         once(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        once(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
-        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
         prependListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        prependListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
-        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
         prependOnceListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
-        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "response", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
     }
 
     export interface ServerHttp2Stream extends Http2Stream {
@@ -7156,32 +7159,32 @@ declare module "http2" {
         addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         addListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        addListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
 
         emit(event: string | symbol, ...args: any[]): boolean;
         emit(event: "altsvc", alt: string, origin: string, stream: number): boolean;
         emit(event: "connect", session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket): boolean;
-        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number): boolean;
+        emit(event: "stream", stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
         on(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         on(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        on(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
 
         once(event: string, listener: (...args: any[]) => void): this;
         once(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         once(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        once(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         prependListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
         prependOnceListener(event: "connect", listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): this;
-        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders, flags: number) => void): this;
+        prependOnceListener(event: "stream", listener: (stream: ClientHttp2Stream, headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
     }
 
     export interface AlternativeServiceOptions {
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 740ad1f61a..165dd06024 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -3561,7 +3561,9 @@ namespace http2_tests {
         let clientHttp2Stream: http2.ClientHttp2Stream;
         clientHttp2Stream.on('headers', (headers: http2.IncomingHttpHeaders, flags: number) => {});
         clientHttp2Stream.on('push', (headers: http2.IncomingHttpHeaders, flags: number) => {});
-        clientHttp2Stream.on('response', (headers: http2.IncomingHttpHeaders, flags: number) => {});
+        clientHttp2Stream.on('response', (headers: http2.IncomingHttpHeaders & http2.IncomingHttpStatusHeader, flags: number) => {
+            const s: number = headers[':status'];
+        });
 
         // ServerHttp2Stream
         let serverHttp2Stream: http2.ServerHttp2Stream;

From 189708112fabb6fc14a81db533347fd4220da1c2 Mon Sep 17 00:00:00 2001
From: Alessio Paccoia <alessio.paccoia@cubbit.net>
Date: Wed, 13 Jun 2018 14:31:37 +0200
Subject: [PATCH 139/141] Added pem-jwk types

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

diff --git a/types/pem-jwk/index.d.ts b/types/pem-jwk/index.d.ts
new file mode 100644
index 0000000000..3a9d32c112
--- /dev/null
+++ b/types/pem-jwk/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for pem-jwk 1.5
+// Project: https://github.com/dannycoates/pem-jwk
+// Definitions by: Alessio Paccoia <https://github.com/alessiopcc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function pem2jwk(pem: string): RSAJWK;
+export function jwk2pem(jwk: RSAJWK): string;
+
+export type RSAJWK = RSAPrivateJWK | RSAPublicJWK;
+
+export interface RSAPrivateJWK {
+    kty: string;
+    n: string;
+    e: string;
+    d: string;
+    p: string;
+    q: string;
+    dp: string;
+    dq: string;
+    qi: string;
+}
+
+export interface RSAPublicJWK {
+    kty: string;
+    n: string;
+    e: string;
+}
diff --git a/types/pem-jwk/pem-jwk-tests.ts b/types/pem-jwk/pem-jwk-tests.ts
new file mode 100644
index 0000000000..4d0c774d9f
--- /dev/null
+++ b/types/pem-jwk/pem-jwk-tests.ts
@@ -0,0 +1,4 @@
+import * as pem_jwk from "pem-jwk";
+
+pem_jwk.jwk2pem({kty: 'RSA', n: 'base64 modulus', e: 'base64 exponent'}); // $ExpectType string
+pem_jwk.pem2jwk('PEM RSA String'); // $ExpectType pem_jwk.RSAJWK
diff --git a/types/pem-jwk/tsconfig.json b/types/pem-jwk/tsconfig.json
new file mode 100644
index 0000000000..b2562d8bae
--- /dev/null
+++ b/types/pem-jwk/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",
+        "pem-jwk-tests.ts"
+    ]
+}
diff --git a/types/pem-jwk/tslint.json b/types/pem-jwk/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pem-jwk/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a7b02c6342ef50e90ddc0082572e5fc8bb636cb0 Mon Sep 17 00:00:00 2001
From: Alessio Paccoia <alessio.paccoia@cubbit.net>
Date: Wed, 13 Jun 2018 17:37:39 +0200
Subject: [PATCH 140/141] Fixed tslint. Minor changes

---
 types/pem-jwk/index.d.ts       | 26 +++++++++-----------------
 types/pem-jwk/pem-jwk-tests.ts | 19 ++++++++++++++++---
 types/pem-jwk/tsconfig.json    |  1 +
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/types/pem-jwk/index.d.ts b/types/pem-jwk/index.d.ts
index 3a9d32c112..c206b12db2 100644
--- a/types/pem-jwk/index.d.ts
+++ b/types/pem-jwk/index.d.ts
@@ -3,25 +3,17 @@
 // Definitions by: Alessio Paccoia <https://github.com/alessiopcc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export function pem2jwk(pem: string): RSAJWK;
-export function jwk2pem(jwk: RSAJWK): string;
-
-export type RSAJWK = RSAPrivateJWK | RSAPublicJWK;
-
-export interface RSAPrivateJWK {
+export interface RSA_JWK {
     kty: string;
     n: string;
     e: string;
-    d: string;
-    p: string;
-    q: string;
-    dp: string;
-    dq: string;
-    qi: string;
+    d?: string;
+    p?: string;
+    q?: string;
+    dp?: string;
+    dq?: string;
+    qi?: string;
 }
 
-export interface RSAPublicJWK {
-    kty: string;
-    n: string;
-    e: string;
-}
+export function pem2jwk(rsa_pem: string): RSA_JWK;
+export function jwk2pem(rsa_jwk: RSA_JWK): string;
diff --git a/types/pem-jwk/pem-jwk-tests.ts b/types/pem-jwk/pem-jwk-tests.ts
index 4d0c774d9f..8876f14373 100644
--- a/types/pem-jwk/pem-jwk-tests.ts
+++ b/types/pem-jwk/pem-jwk-tests.ts
@@ -1,4 +1,17 @@
-import * as pem_jwk from "pem-jwk";
+import { jwk2pem, pem2jwk, RSA_JWK } from "pem-jwk";
 
-pem_jwk.jwk2pem({kty: 'RSA', n: 'base64 modulus', e: 'base64 exponent'}); // $ExpectType string
-pem_jwk.pem2jwk('PEM RSA String'); // $ExpectType pem_jwk.RSAJWK
+const rsa_pem = `-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDh6RzHEsTFjD8NlB4echurwfV2
+Zrlcg0k2JoP0Z3QAgXPMwJynvs2LeBHYaOFzGzjXRKsvaLwc5PjP3NcqcP3KkX5y
+1VA31VrJLfFbXthi0a8c/UBwxJD8i4S35OKr6yui3bJatgYWrSQ4MT9ktaS1TP9l
+XBW58V4VlkypTaQTSQIDAQAB
+-----END PUBLIC KEY-----`;
+
+const rsa_jwk: RSA_JWK = {
+    kty: 'RSA',
+    n: '4ekcxxLExYw_DZQeHnIbq8H1dma5XINJNiaD9Gd0AIFzzMCcp77Ni3gR2Gjhcxs410SrL2i8HOT4z9zXKnD9ypF-ctVQN9VayS3xW17YYtGvHP1AcMSQ_IuEt-Tiq-srot2yWrYGFq0kODE_ZLWktUz_ZVwVufFeFZZMqU2kE0k',
+    e: 'AQAB'
+};
+
+jwk2pem(rsa_jwk); // $ExpectType string
+pem2jwk(rsa_pem); // $ExpectType RSA_JWK
diff --git a/types/pem-jwk/tsconfig.json b/types/pem-jwk/tsconfig.json
index b2562d8bae..992cd51066 100644
--- a/types/pem-jwk/tsconfig.json
+++ b/types/pem-jwk/tsconfig.json
@@ -6,6 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [

From ddf6cf66f25dffae43683ba7e497ce893625b54e Mon Sep 17 00:00:00 2001
From: nrlquaker <ustynov.vy@gmail.com>
Date: Tue, 22 May 2018 20:43:43 +0300
Subject: [PATCH 141/141] Add type definition for buffer-reader

---
 types/buffer-reader/buffer-reader-tests.ts |  28 ++++++
 types/buffer-reader/index.d.ts             | 111 +++++++++++++++++++++
 types/buffer-reader/tsconfig.json          |  24 +++++
 types/buffer-reader/tslint.json            |   1 +
 4 files changed, 164 insertions(+)
 create mode 100644 types/buffer-reader/buffer-reader-tests.ts
 create mode 100644 types/buffer-reader/index.d.ts
 create mode 100644 types/buffer-reader/tsconfig.json
 create mode 100644 types/buffer-reader/tslint.json

diff --git a/types/buffer-reader/buffer-reader-tests.ts b/types/buffer-reader/buffer-reader-tests.ts
new file mode 100644
index 0000000000..9868131c93
--- /dev/null
+++ b/types/buffer-reader/buffer-reader-tests.ts
@@ -0,0 +1,28 @@
+import BufferReader from 'buffer-reader';
+
+const buffer = new Buffer(1000);
+const reader = new BufferReader(buffer);
+reader.append(new Buffer(1));
+reader.tell();
+reader.seek(1);
+reader.move(2);
+reader.restAll();
+reader.nextBuffer(2);
+reader.nextString(5);
+reader.nextString(5, 'utf8');
+reader.nextStringZero();
+reader.nextStringZero('utf8');
+reader.nextInt8();
+reader.nextUInt8();
+reader.nextInt16LE();
+reader.nextUInt16LE();
+reader.nextInt16BE();
+reader.nextUInt16BE();
+reader.nextInt32LE();
+reader.nextUInt32LE();
+reader.nextInt32BE();
+reader.nextUInt32BE();
+reader.nextFloatLE();
+reader.nextFloatBE();
+reader.nextDouble32LE();
+reader.nextDouble32BE();
diff --git a/types/buffer-reader/index.d.ts b/types/buffer-reader/index.d.ts
new file mode 100644
index 0000000000..e83f081e69
--- /dev/null
+++ b/types/buffer-reader/index.d.ts
@@ -0,0 +1,111 @@
+// Type definitions for buffer-reader 0.1
+// Project: https://github.com/villadora/node-buffer-reader
+// Definitions by: nrlquaker <https://github.com/nrlquaker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+/// <reference types="node"/>
+
+export = BufferReader;
+
+declare class BufferReader {
+    /**
+     * Create a new reader, if no buffer provided, a empty buffer will be used.
+     */
+    constructor(buffer?: Buffer)
+    /**
+     * Append new buffer to the end of current reader.
+     * @param buffer buffer to append
+     */
+    append(buffer: Buffer): void;
+    /**
+     * Return current position of the reader.
+     */
+    tell(): number;
+    /**
+     * Set new position of the reader, if the pos is invalid, an exception will be raised.
+     * @param position new position
+     */
+    seek(position: number): void;
+    /**
+     * Move the position of reader by offset, offset can be negative; it can be used to skip some bytes.
+     * @param offset offset to move by
+     */
+    move(offset: number): void;
+    /**
+     * Get all the remaining bytes as a Buffer.
+     */
+    restAll(): Buffer;
+    /**
+     * Read a buffer with specified length.
+     * @param length specified length
+     */
+    nextBuffer(length: number): Buffer;
+    /**
+     * Read next length of bytes as String, encoding default is 'utf8'.
+     * @param length length of the string to read
+     * @param encoding encoding of the string
+     */
+    nextString(length: number, encoding?: string): string;
+    /**
+     * Read next bytes till the end of buffer as null-terminated string, encoding default is 'utf8'.
+     * @param encoding encoding of the string
+     */
+    nextStringZero(encoding?: string): string;
+    /**
+     * Read next bytes as Int8, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextInt8(): number;
+    /**
+     * Read next bytes as UInt8, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextUInt8(): number;
+    /**
+     * Read next bytes as Int16LE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextInt16LE(): number;
+    /**
+     * Read next bytes as UInt16LE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextUInt16LE(): number;
+    /**
+     * Read next bytes as Int16BE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextInt16BE(): number;
+    /**
+     * Read next bytes as UInt16BE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextUInt16BE(): number;
+    /**
+     * Read next bytes as Int32LE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextInt32LE(): number;
+    /**
+     * Read next bytes as UInt32LE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextUInt32LE(): number;
+    /**
+     * Read next bytes as Int32BE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextInt32BE(): number;
+    /**
+     * Read next bytes as UInt32BE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextUInt32BE(): number;
+    /**
+     * Read next bytes as FloatLE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextFloatLE(): number;
+    /**
+     * Read next bytes as FloatBE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextFloatBE(): number;
+    /**
+     * Read next bytes as Double32LE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextDouble32LE(): number;
+    /**
+     * Read next bytes as Double32BE, the value is just as the same format Buffer in nodejs doc.
+     */
+    nextDouble32BE(): number;
+}
diff --git a/types/buffer-reader/tsconfig.json b/types/buffer-reader/tsconfig.json
new file mode 100644
index 0000000000..da70d80fe1
--- /dev/null
+++ b/types/buffer-reader/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "esModuleInterop": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "buffer-reader-tests.ts"
+    ]
+}
diff --git a/types/buffer-reader/tslint.json b/types/buffer-reader/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/buffer-reader/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }