From b875a296ffb56a74061b1dcda4cdfafc2aec781e Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Mon, 28 May 2018 00:35:26 +0200
Subject: [PATCH 01/64] Added type definitions for imperium

---
 types/imperium/imperium-tests.ts | 21 ++++++++
 types/imperium/index.d.ts        | 93 ++++++++++++++++++++++++++++++++
 types/imperium/tsconfig.json     | 23 ++++++++
 3 files changed, 137 insertions(+)
 create mode 100644 types/imperium/imperium-tests.ts
 create mode 100644 types/imperium/index.d.ts
 create mode 100644 types/imperium/tsconfig.json

diff --git a/types/imperium/imperium-tests.ts b/types/imperium/imperium-tests.ts
new file mode 100644
index 0000000000..2f6cbaa8b4
--- /dev/null
+++ b/types/imperium/imperium-tests.ts
@@ -0,0 +1,21 @@
+import imperium from 'imperium'
+
+import { Imperium, ImperiumUnauthorizedError } from 'imperium'
+
+imperium.role('admin', async (req) => {
+    return req.session.role === 'admin'
+})
+
+imperium.role('user')
+    .can('seeUser', { user: '@' })
+    .can('manageUser', { user: '@' })
+
+imperium.role('admin')
+    .is('user', { user: '*' })
+
+imperium.can('seeUser')
+imperium.can(['seeUser', 'manageUser'])
+imperium.can({ action: 'seeUser', user: ':userId' })
+imperium.can([{ action: 'manageUser', user: ':userId' }])
+imperium.is('admin')
+imperium.is(['admin', 'user'])
diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
new file mode 100644
index 0000000000..2695e79574
--- /dev/null
+++ b/types/imperium/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for imperium v2.0.2
+// Project: https://www.npmjs.org/package/mono-js/imperium
+// Definitions by: Gaetan SENN <https://github.com/gaetansenn>
+// Definitions: https://github.com/psnider/DefinitelyTyped/imperium
+// TypeScript Version: 2.7
+
+/// <reference types="node" />
+/// <reference types="express" />
+
+declare module 'imperium' {
+    type ImperiumMiddleware = (req: Express.Request, res: Express.Response, next: Function) => Promise<void>
+    type ImperiumGetAcl = (req: Express.Request) => Promise<Boolean> | Promise<Object>
+    type ImperiumActions = Array<String> | String
+    type ImperiumContext = Array<'params' | 'query' | 'headers' | 'body'>
+    // Can contain when key that is evaluated during route action
+    type ImperiumRoleParams = { [key: string]: String }
+
+    export class Imperium {
+        constructor()
+
+        context: Array<String>
+        roles: Roles
+
+        // Add new role with specific ImperiumGetAcl
+        role(roleName: String, getAcl: ImperiumGetAcl): ImperiumRole
+
+        // Return specific imperium role instance
+        role(roleName: String): ImperiumRole
+
+        // Check if user has role
+        is(roleName: String): ImperiumMiddleware
+
+        // Check if user has on of listed roles act like an OR
+        is(roleNames: Array<String>): ImperiumMiddleware
+
+        // Check if current user can do action
+        can(action: String): ImperiumMiddleware
+
+        can(actions: Array<String>): ImperiumMiddleware
+
+        can(action: Action): ImperiumMiddleware
+
+        can(actions: Array<Action>): ImperiumMiddleware
+
+        private addRole(roleName: String, getAcl: ImperiumGetAcl): void
+
+        private evaluateRouteActions(req: Express.Request, action: Array<Action>, context: ImperiumContext): ImperiumActions
+
+        private evaluateRouteAction(req: Express.Request, expr: String, key: String, context: ImperiumContext): String
+
+        private evaluateUserActions(req: Express.Request, roles: Array<ImperiumRole>): Promise<Array<Action>>
+
+        private evaluateUserAction(action: ImperiumRoleParams, context: { [key: string]: Array<String> }): { [key: string]: Array<String> }
+    }
+
+    interface Roles {
+        [key: string]: Role
+    }
+
+    interface Role {
+        actions: Array<Action>
+        getAcl?: ImperiumGetAcl
+    }
+
+    interface Action {
+        action: String
+        [key: string]: String
+    }
+
+    export class ImperiumRole {
+        constructor(imperium: Imperium, roleName: String)
+
+        // Imperium instance to retreive child role
+        imperium: Imperium
+        // Role name
+        roleName: String
+        // Contain all the actions for this specific role
+        role: Role
+
+        /* Add action with specific params */
+        can(action: String, params: ImperiumRoleParams): ImperiumRole
+
+        /* Get actions of childRoleName and replace params */
+        is(childRoleName: String, params: ImperiumRoleParams): ImperiumRole
+    }
+
+    export class ImperiumUnauthorizedError extends Error {
+        constructor(message: String, status: number, context: any)
+    }
+
+    const out: Imperium
+    export default out
+}
diff --git a/types/imperium/tsconfig.json b/types/imperium/tsconfig.json
new file mode 100644
index 0000000000..597aae24fa
--- /dev/null
+++ b/types/imperium/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "imperium-tests.ts"
+  ]
+}

From a78b7f9d7e0b4be38aeb472c6100920c267e71bc Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Mon, 28 May 2018 16:15:06 +0200
Subject: [PATCH 02/64] imperium: Add tslint and fix compilation

---
 types/imperium/imperium-tests.ts |  4 +-
 types/imperium/index.d.ts        | 54 +++++++++++-----------
 types/imperium/tsconfig.json     | 43 ++++++++---------
 types/imperium/tslint.json       | 79 ++++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+), 49 deletions(-)
 create mode 100644 types/imperium/tslint.json

diff --git a/types/imperium/imperium-tests.ts b/types/imperium/imperium-tests.ts
index 2f6cbaa8b4..72fda8f52a 100644
--- a/types/imperium/imperium-tests.ts
+++ b/types/imperium/imperium-tests.ts
@@ -1,9 +1,9 @@
 import imperium from 'imperium'
 
-import { Imperium, ImperiumUnauthorizedError } from 'imperium'
+import { Imperium, UnauthorizedError } from 'imperium'
 
 imperium.role('admin', async (req) => {
-    return req.session.role === 'admin'
+    return true
 })
 
 imperium.role('user')
diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index 2695e79574..f7f2191a3f 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -8,12 +8,14 @@
 /// <reference types="express" />
 
 declare module 'imperium' {
-    type ImperiumMiddleware = (req: Express.Request, res: Express.Response, next: Function) => Promise<void>
-    type ImperiumGetAcl = (req: Express.Request) => Promise<Boolean> | Promise<Object>
-    type ImperiumActions = Array<String> | String
-    type ImperiumContext = Array<'params' | 'query' | 'headers' | 'body'>
+    import express = require('express')
+
+    type Middleware = (req: express.Request, res: express.Response, next: Function) => Promise<void>
+    type GetAcl = (req: express.Request) => Promise<Boolean> | Promise<Object>
+    type Actions = Array<String> | String
+    type Context = Array<'params' | 'query' | 'headers' | 'body'>
     // Can contain when key that is evaluated during route action
-    type ImperiumRoleParams = { [key: string]: String }
+    type RoleParams = { [key: string]: String }
 
     export class Imperium {
         constructor()
@@ -22,44 +24,44 @@ declare module 'imperium' {
         roles: Roles
 
         // Add new role with specific ImperiumGetAcl
-        role(roleName: String, getAcl: ImperiumGetAcl): ImperiumRole
+        role(roleName: String, getAcl: GetAcl): Role
 
         // Return specific imperium role instance
-        role(roleName: String): ImperiumRole
+        role(roleName: String): Role
 
         // Check if user has role
-        is(roleName: String): ImperiumMiddleware
+        is(roleName: String): Middleware
 
         // Check if user has on of listed roles act like an OR
-        is(roleNames: Array<String>): ImperiumMiddleware
+        is(roleNames: Array<String>): Middleware
 
         // Check if current user can do action
-        can(action: String): ImperiumMiddleware
+        can(action: String): Middleware
 
-        can(actions: Array<String>): ImperiumMiddleware
+        can(actions: Array<String>): Middleware
 
-        can(action: Action): ImperiumMiddleware
+        can(action: Action): Middleware
 
-        can(actions: Array<Action>): ImperiumMiddleware
+        can(actions: Array<Action>): Middleware
 
-        private addRole(roleName: String, getAcl: ImperiumGetAcl): void
+        private addRole(roleName: String, getAcl: GetAcl): void
 
-        private evaluateRouteActions(req: Express.Request, action: Array<Action>, context: ImperiumContext): ImperiumActions
+        private evaluateRouteActions(req: express.Request, action: Array<Action>, context: Context): Actions
 
-        private evaluateRouteAction(req: Express.Request, expr: String, key: String, context: ImperiumContext): String
+        private evaluateRouteAction(req: express.Request, expr: String, key: String, context: Context): String
 
-        private evaluateUserActions(req: Express.Request, roles: Array<ImperiumRole>): Promise<Array<Action>>
+        private evaluateUserActions(req: express.Request, roles: Array<Role>): Promise<Array<Action>>
 
-        private evaluateUserAction(action: ImperiumRoleParams, context: { [key: string]: Array<String> }): { [key: string]: Array<String> }
+        private evaluateUserAction(action: RoleParams, context: { [key: string]: Array<String> }): { [key: string]: Array<String> }
     }
 
     interface Roles {
-        [key: string]: Role
+        [key: string]: RoleActions
     }
 
-    interface Role {
+    interface RoleActions {
         actions: Array<Action>
-        getAcl?: ImperiumGetAcl
+        getAcl?: GetAcl
     }
 
     interface Action {
@@ -67,7 +69,7 @@ declare module 'imperium' {
         [key: string]: String
     }
 
-    export class ImperiumRole {
+    export class Role {
         constructor(imperium: Imperium, roleName: String)
 
         // Imperium instance to retreive child role
@@ -75,16 +77,16 @@ declare module 'imperium' {
         // Role name
         roleName: String
         // Contain all the actions for this specific role
-        role: Role
+        role: RoleActions
 
         /* Add action with specific params */
-        can(action: String, params: ImperiumRoleParams): ImperiumRole
+        can(action: String, params: RoleParams): Role
 
         /* Get actions of childRoleName and replace params */
-        is(childRoleName: String, params: ImperiumRoleParams): ImperiumRole
+        is(childRoleName: String, params: RoleParams): Role
     }
 
-    export class ImperiumUnauthorizedError extends Error {
+    export class UnauthorizedError extends Error {
         constructor(message: String, status: number, context: any)
     }
 
diff --git a/types/imperium/tsconfig.json b/types/imperium/tsconfig.json
index 597aae24fa..98e23e4de8 100644
--- a/types/imperium/tsconfig.json
+++ b/types/imperium/tsconfig.json
@@ -1,23 +1,24 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": false,
-    "strictFunctionTypes": true,
-    "baseUrl": "../",
-    "typeRoots": [
-      "../"
-    ],
-    "noEmit": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-    "index.d.ts",
-    "imperium-tests.ts"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "imperium-tests.ts"
+    ]
 }
diff --git a/types/imperium/tslint.json b/types/imperium/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imperium/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From 9cb77195a439c097b6778f113c0c24c17eac02ef Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Tue, 29 May 2018 11:33:45 +0200
Subject: [PATCH 03/64] imperium: Fix feedback from plantain-00

---
 types/imperium/index.d.ts    |  2 +-
 types/imperium/tsconfig.json |  2 +-
 types/imperium/tslint.json   | 78 +-----------------------------------
 3 files changed, 3 insertions(+), 79 deletions(-)

diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index f7f2191a3f..cdfbf3da39 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for imperium v2.0.2
-// Project: https://www.npmjs.org/package/mono-js/imperium
+// Project: https://www.npmjs.org/package/imperium
 // Definitions by: Gaetan SENN <https://github.com/gaetansenn>
 // Definitions: https://github.com/psnider/DefinitelyTyped/imperium
 // TypeScript Version: 2.7
diff --git a/types/imperium/tsconfig.json b/types/imperium/tsconfig.json
index 98e23e4de8..c8563caffe 100644
--- a/types/imperium/tsconfig.json
+++ b/types/imperium/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/imperium/tslint.json b/types/imperium/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/imperium/tslint.json
+++ b/types/imperium/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }

From 804f2e4a6ffae02cffffa104d7d4ce5048d8fb5d Mon Sep 17 00:00:00 2001
From: Peter Keuter <github@peterkeuter.nl>
Date: Tue, 29 May 2018 11:55:33 +0200
Subject: [PATCH 04/64] Add label render function

---
 types/recharts/index.d.ts         | 10 +++++-----
 types/recharts/recharts-tests.tsx |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index ecdcd1f420..1bbb1b158e 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -163,7 +163,7 @@ export interface AreaProps extends EventAttributes, Partial<PresentationAttribut
     connectNulls?: boolean;
     activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
-    label?: boolean | object | React.ReactElement<any> | LabelProps['content'];
+    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any> | LabelProps['content'];
     hide?: boolean;
     layout?: LayoutType;
     baseLine?: number | any[];
@@ -207,7 +207,7 @@ export interface BarProps extends EventAttributes, Partial<PresentationAttribute
     shape?: React.ReactElement<any> | ContentRenderer<RectangleProps>;
     data?: BarData[];
     // see label section at http://recharts.org/#/en-US/api/Bar
-    label?: boolean | Label | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<Label>;
+    label?: boolean | Label | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<any>;
 }
 
 export class Bar extends React.Component<BarProps> { }
@@ -404,7 +404,7 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     width?: number;
     height?: number;
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
-    label?: boolean | object | React.ReactElement<any> | LabelProps['content'];
+    label?: boolean | object | React.ReactElement<any> | ContentRenderer<any> | LabelProps['content'];
     points?: Point[];
 }
 
@@ -437,7 +437,7 @@ export interface PieProps extends EventAttributes, Partial<PresentationAttribute
     labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
     label?: {
         offsetRadius: number;
-    } | LabelProps['content'] | React.ReactElement<any> | boolean;
+    } | LabelProps['content'] | React.ReactElement<any> | ContentRenderer<any> | boolean;
     activeShape?: object |ContentRenderer<any> | React.ReactElement<any>;
     activeIndex?: number | number[];
 }
@@ -552,7 +552,7 @@ export interface RadarProps extends EventAttributes, Partial<PresentationAttribu
     shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
     activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
     dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
-    label?: object | React.ReactElement<any> | LabelProps['content'] | boolean;
+    label?: object | React.ReactElement<any> | ContentRenderer<any> | LabelProps['content'] | boolean;
     legendType?: LegendType;
     hide?: boolean;
 }
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 7eed634119..3b6775d2d9 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -160,6 +160,7 @@ class Component extends React.Component<{}, ComponentState> {
                 <ResponsiveContainer>
                     <PieChart width={800} height={400}>
                         <Pie
+                            label={(props: {name: string}) => <Label>{name}</Label>}
                             dataKey="value"
                             activeIndex={this.state.activeIndex}
                             activeShape={renderActiveShape}

From 5f9d43f6ea13b7bafeba115ec5f29f32d3665271 Mon Sep 17 00:00:00 2001
From: Peter Keuter <github@peterkeuter.nl>
Date: Tue, 29 May 2018 11:57:51 +0200
Subject: [PATCH 05/64] Add author

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 1bbb1b158e..a2e2024343 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -6,6 +6,7 @@
 //                 Zheyang Song <https://github.com/ZheyangSong>
 //                 Rich Baird <https://github.com/richbai90>
 //                 Dan Torberg <https://github.com/caspeco-dan>
+//                 Peter Keuter <https://github.com/pkeuter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 228d215c8fed5102a8b7769eb8584b65c4e2e79e Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Tue, 29 May 2018 12:19:47 +0200
Subject: [PATCH 06/64] imperium: Fix tslint errors

---
 types/imperium/imperium-tests.ts |  24 +++--
 types/imperium/index.d.ts        | 158 ++++++++++++++-----------------
 2 files changed, 83 insertions(+), 99 deletions(-)

diff --git a/types/imperium/imperium-tests.ts b/types/imperium/imperium-tests.ts
index 72fda8f52a..f7380c25cc 100644
--- a/types/imperium/imperium-tests.ts
+++ b/types/imperium/imperium-tests.ts
@@ -1,21 +1,19 @@
-import imperium from 'imperium'
-
-import { Imperium, UnauthorizedError } from 'imperium'
+import imperium from 'imperium';
 
 imperium.role('admin', async (req) => {
-    return true
-})
+    return true;
+});
 
 imperium.role('user')
     .can('seeUser', { user: '@' })
-    .can('manageUser', { user: '@' })
+    .can('manageUser', { user: '@' });
 
 imperium.role('admin')
-    .is('user', { user: '*' })
+    .is('user', { user: '*' });
 
-imperium.can('seeUser')
-imperium.can(['seeUser', 'manageUser'])
-imperium.can({ action: 'seeUser', user: ':userId' })
-imperium.can([{ action: 'manageUser', user: ':userId' }])
-imperium.is('admin')
-imperium.is(['admin', 'user'])
+imperium.can('seeUser');
+imperium.can(['seeUser', 'manageUser']);
+imperium.can({ action: 'seeUser', user: ':userId' });
+imperium.can([{ action: 'manageUser', user: ':userId' }]);
+imperium.is('admin');
+imperium.is(['admin', 'user']);
diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index cdfbf3da39..9ec2ca9c09 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -1,95 +1,81 @@
-// Type definitions for imperium v2.0.2
+// Type definitions for imperium 2.0
 // Project: https://www.npmjs.org/package/imperium
 // Definitions by: Gaetan SENN <https://github.com/gaetansenn>
 // Definitions: https://github.com/psnider/DefinitelyTyped/imperium
 // TypeScript Version: 2.7
 
 /// <reference types="node" />
-/// <reference types="express" />
 
-declare module 'imperium' {
-    import express = require('express')
+import express = require('express');
 
-    type Middleware = (req: express.Request, res: express.Response, next: Function) => Promise<void>
-    type GetAcl = (req: express.Request) => Promise<Boolean> | Promise<Object>
-    type Actions = Array<String> | String
-    type Context = Array<'params' | 'query' | 'headers' | 'body'>
-    // Can contain when key that is evaluated during route action
-    type RoleParams = { [key: string]: String }
-
-    export class Imperium {
-        constructor()
-
-        context: Array<String>
-        roles: Roles
-
-        // Add new role with specific ImperiumGetAcl
-        role(roleName: String, getAcl: GetAcl): Role
-
-        // Return specific imperium role instance
-        role(roleName: String): Role
-
-        // Check if user has role
-        is(roleName: String): Middleware
-
-        // Check if user has on of listed roles act like an OR
-        is(roleNames: Array<String>): Middleware
-
-        // Check if current user can do action
-        can(action: String): Middleware
-
-        can(actions: Array<String>): Middleware
-
-        can(action: Action): Middleware
-
-        can(actions: Array<Action>): Middleware
-
-        private addRole(roleName: String, getAcl: GetAcl): void
-
-        private evaluateRouteActions(req: express.Request, action: Array<Action>, context: Context): Actions
-
-        private evaluateRouteAction(req: express.Request, expr: String, key: String, context: Context): String
-
-        private evaluateUserActions(req: express.Request, roles: Array<Role>): Promise<Array<Action>>
-
-        private evaluateUserAction(action: RoleParams, context: { [key: string]: Array<String> }): { [key: string]: Array<String> }
-    }
-
-    interface Roles {
-        [key: string]: RoleActions
-    }
-
-    interface RoleActions {
-        actions: Array<Action>
-        getAcl?: GetAcl
-    }
-
-    interface Action {
-        action: String
-        [key: string]: String
-    }
-
-    export class Role {
-        constructor(imperium: Imperium, roleName: String)
-
-        // Imperium instance to retreive child role
-        imperium: Imperium
-        // Role name
-        roleName: String
-        // Contain all the actions for this specific role
-        role: RoleActions
-
-        /* Add action with specific params */
-        can(action: String, params: RoleParams): Role
-
-        /* Get actions of childRoleName and replace params */
-        is(childRoleName: String, params: RoleParams): Role
-    }
-
-    export class UnauthorizedError extends Error {
-        constructor(message: String, status: number, context: any)
-    }
-
-    const out: Imperium
-    export default out
+type GetAcl = (req: express.Request) => Promise<boolean> | Promise<object>;
+type Actions = string[] | string;
+type Context = Array<'params' | 'query' | 'headers' | 'body'>;
+// Can contain when key that is evaluated during route action
+interface RoleParams {
+    [key: string]: string;
 }
+
+export class Imperium {
+    constructor()
+
+    context: string[];
+    roles: Roles;
+
+    // Add new role with specific ImperiumGetAcl
+    role(roleName: string, getAcl?: GetAcl): Role;
+
+    // Check if user has role(s) act like as an OR
+    is(roleNames: string | string[]): Promise<express.RequestHandler>;
+
+    // Check if current user can do action(s)
+    can(actionS: string | string[] | Action | Action[]): Promise<express.RequestHandler>;
+
+    private addRole(roleName: string, getAcl: GetAcl): void;
+
+    private evaluateRouteActions(req: express.Request, action: Action[], context: Context): Actions;
+
+    private evaluateRouteAction(req: express.Request, expr: string, key: string, context: Context): string;
+
+    private evaluateUserActions(req: express.Request, roles: Role[]): Promise<Action[]>;
+
+    private evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
+}
+
+interface Roles {
+    [key: string]: RoleActions;
+}
+
+interface RoleActions {
+    actions: Action[];
+    getAcl?: GetAcl;
+}
+
+interface Action {
+    action: string;
+    [key: string]: string;
+}
+
+export class Role {
+    constructor(imperium: Imperium, roleName: string)
+
+    // Imperium instance to retreive child role
+    imperium: Imperium;
+    // Role name
+    roleName: string;
+    // Contain all the actions for this specific role
+    role: RoleActions;
+
+    /* Add action with specific params */
+    can(action: string, params: RoleParams): Role;
+
+    /* Get actions of childRoleName and replace params */
+    is(childRoleName: string, params: RoleParams): Role;
+}
+
+export class UnauthorizedError extends Error {
+    constructor(message: string, status: number, context: any)
+}
+
+declare const init: Imperium;
+export default init;

From df6cd13a68b1e46e96d3b5847ab237c239042ef4 Mon Sep 17 00:00:00 2001
From: John Conley <jcjunction@gmail.com>
Date: Tue, 29 May 2018 09:19:55 -0500
Subject: [PATCH 07/64] Make schema example property spec compliant

According to the official specification (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md), the example property of the Schema object should not have any type requirements and should therefore be any.
---
 types/swagger-schema-official/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/swagger-schema-official/index.d.ts b/types/swagger-schema-official/index.d.ts
index dc184d3e91..190e1ead7d 100644
--- a/types/swagger-schema-official/index.d.ts
+++ b/types/swagger-schema-official/index.d.ts
@@ -147,7 +147,7 @@ export interface Schema extends BaseSchema {
   readOnly?: boolean;
   xml?: XML;
   externalDocs?: ExternalDocs;
-  example?: {[exampleName: string]: {}};
+  example?: any;
   required?: string[];
 }
 

From db44ac9f22db6127a6ec7240705f5cf92c124291 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 12:35:18 -0600
Subject: [PATCH 08/64] Add DescribeSObject typings and cached describe
 functions

---
 types/jsforce/cache.d.ts             |  21 +++
 types/jsforce/connection.d.ts        |   6 +
 types/jsforce/describe-result.d.ts   | 221 ++++++++++++++++++++++++++-
 types/jsforce/index.d.ts             |   2 +
 types/jsforce/jsforce-tests.ts       |  31 +++-
 types/jsforce/salesforce-object.d.ts |   8 +
 types/jsforce/tsconfig.json          |   2 +-
 7 files changed, 285 insertions(+), 6 deletions(-)
 create mode 100644 types/jsforce/cache.d.ts

diff --git a/types/jsforce/cache.d.ts b/types/jsforce/cache.d.ts
new file mode 100644
index 0000000000..35241eb639
--- /dev/null
+++ b/types/jsforce/cache.d.ts
@@ -0,0 +1,21 @@
+import { EventEmitter } from 'events';
+
+export class CacheEntry<T> extends EventEmitter {
+  get(callback?: (err: Error, result: T) => void): T | undefined;
+  set(value: T): void;
+  clear(): void;
+}
+
+export class Cache {
+  /**
+   * Clear cache entries prefix matching given key
+   * @param key Key prefix of cache entry to clear
+   */
+  clear(key?: string): void;
+
+  /**
+   * Retrieve cache entry, or create if not exists
+   * @param key Key of cache entry
+   */
+  get<T>(key?: string): CacheEntry<T>;
+}
\ No newline at end of file
diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 32ed4de267..8f6f50efc5 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -8,6 +8,7 @@ import { Analytics } from './api/analytics';
 import { Chatter } from './api/chatter';
 import { Metadata } from './api/metadata';
 import { Bulk } from './bulk';
+import { Cache } from './cache'
 import { OAuth2, Streaming } from '.';
 
 export type Callback<T> = (err: Error, result: T) => void;
@@ -111,7 +112,11 @@ export abstract class BaseConnection extends EventEmitter {
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     destroy<T>(type: string, ids: string | string[], options?: Object,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
+    /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
+    describe$<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
+    describeGlobal$<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     sobject<T>(resource: string): SObject<T>;
 }
@@ -126,6 +131,7 @@ export class Connection extends BaseConnection {
     bulk: Bulk;
     oauth2: OAuth2;
     streaming: Streaming;
+    cache: Cache;
 
     // Specific to Connection
     instanceUrl: string;
diff --git a/types/jsforce/describe-result.d.ts b/types/jsforce/describe-result.d.ts
index 352c4223a6..17da9f5917 100644
--- a/types/jsforce/describe-result.d.ts
+++ b/types/jsforce/describe-result.d.ts
@@ -1,9 +1,217 @@
+type maybe<T> = (T | null | undefined)
+
+// From
+// https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_calls_describesobjects_describesobjectresult.htm
 export interface DescribeSObjectResult {
+    activateable: boolean;
+    actionOverrides?: maybe<ActionOverride[]>;
+    childRelationships: ChildRelationship[];
+    compactLayoutable: boolean;
+    createable: boolean;
+    custom: boolean;
+    customSetting: boolean;
+    deleteable: boolean;
+    deprecatedAndHidden: boolean;
+    feedEnabled: boolean;
+    fields: Field[];
+    keyPrefix?: maybe<string>;
     label: string;
-    fields: object[];
+    labelPlural: string;
+    layoutable: boolean;
+    listviewable?: maybe<boolean>;
+    lookupLayoutable?: maybe<boolean>;
+    mergeable: boolean;
+    mruEnabled: boolean;
+    name: string;
+    namedLayoutInfos: NamedLayoutInfo[];
+    networkScopeFieldName?: maybe<string>;
+    queryable: boolean;
+    recordTypeInfos: RecordTypeInfo[];
+    replicateable: boolean;
+    retrieveable: boolean;
+    searchable: boolean;
+    searchLayoutable: boolean;
+    supportedScopes: ScopeInfo[];
+    triggerable: boolean;
+    undeleteable: boolean;
+    updateable: boolean;
+    urlDetail?: string;
+    urlEdit?: string;
+    urlNew?: string;
+    urls: Record<string, string>;
 }
 
-export interface DescribeGlobalResult {
+export interface ActionOverride {
+    formFactor: string;
+    isAvailableInTouch: boolean;
+    name: string;
+    pageId: string;
+    url?: maybe<string>;
+}
+
+export interface ChildRelationship {
+    cascadeDelete: boolean;
+    childSObject: string;
+    deprecatedAndHidden: boolean;
+    field: string;
+    junctionIdListNames: string[];
+    junctionReferenceTo: string[];
+    relationshipName?: maybe<string>;
+    restrictedDelete: boolean;
+}
+
+export interface Field {
+    aggregatable: boolean;
+    autonumber: boolean;
+    byteLength: number;
+    calculated: boolean;
+    calculatedFormula?: maybe<string>;
+    cascadeDelete: boolean;
+    caseSensitive: boolean;
+    compoundFieldName?: maybe<string>;
+    controllerName?: maybe<string>;
+    creatable: boolean;
+    custom: boolean;
+    defaultValue?: maybe<string | boolean>;
+    defaultValueFormula?: maybe<string>;
+    defaultedOnCreate: boolean;
+    dependentPicklist: boolean;
+    deprecatedAndHidden: boolean;
+    digits?: maybe<number>;
+    displayLocationInDecimal?: maybe<boolean>;
+    encrypted?: maybe<true>;
+    externalId: boolean;
+    extraTypeInfo?: maybe<ExtraTypeInfo>;
+    filterable: boolean;
+    filteredLookupInfo?: maybe<FilteredLookupInfo>;
+    formula?: maybe<string>;
+    groupable: boolean;
+    highScaleNumber?: maybe<boolean>;
+    htmlFormatted :boolean;
+    idLookup: boolean;
+    inlineHelpText?: maybe<string>;
+    label: string;
+    length: number;
+    mask?: maybe<string>;
+    maskType?: maybe<string>;
+    name: string;
+    nameField: boolean;
+    namePointing: boolean;
+    nillable: boolean;
+    permissionable: boolean;
+    picklistValues?: maybe<PicklistEntry[]>;
+    polymorphicForeignKey: boolean;
+    precision?: maybe<number>;
+    queryByDistance: boolean;
+    relationshipName?: maybe<string>;
+    relationshipOrder?: maybe<number>;
+    referenceTargetField?: maybe<string>;
+    referenceTo?: maybe<string[]>;
+    restrictedPicklist: boolean;
+    scale: number;
+    searchPrefilterable: boolean;
+    soapType: SOAPType;
+    sortable: boolean;
+    type: FieldType;
+    unique: boolean;
+    updateable: boolean;
+    writeRequiresMasterRead?: maybe<boolean>;
+}
+
+export type ExtraTypeInfo =
+    | 'imageurl'
+    | 'personname'
+    | 'plaintextarea'
+    | 'richtextarea'
+    | 'switchablepersonname'
+    | 'externallookup'
+    | 'indirectlookup'
+
+export type FieldType =
+    | 'string'
+    | 'boolean'
+    | 'int'
+    | 'double'
+    | 'date'
+    | 'datetime'
+    | 'base64'
+    | 'id'
+    | 'reference'
+    | 'currency'
+    | 'textarea'
+    | 'percent'
+    | 'phone'
+    | 'url'
+    | 'email'
+    | 'combobox'
+    | 'picklist'
+    | 'multipicklist'
+    | 'anyType'
+    | 'location'
+    // the following are not found in official documentation, but still occur when describing an sobject
+    | 'time'
+    | 'encryptedstring'
+    | 'address'
+    | 'complexvalue'
+
+export interface FilteredLookupInfo {
+    controllingFields: string[];
+    dependent: boolean;
+    optionalFilter: boolean;
+}
+
+export type SOAPType =
+    | 'tns:ID'
+    | 'xsd:anyType'
+    | 'xsd:base64Binary'
+    | 'xsd:boolean'
+    | 'xsd:date'
+    | 'xsd:dateTime'
+    | 'xsd:double'
+    | 'xsd:int'
+    | 'xsd:string'
+    // the following are not found in official documentation, but still occur when describing an sobject
+    | 'xsd:time'
+    | 'urn:address'
+    | 'urn:JunctionIdListNames'
+    | 'urn:location'
+    | 'urn:RecordTypesSupported'
+    | 'urn:RelationshipReferenceTo'
+    | 'urn:SearchLayoutButtonsDisplayed'
+    | 'urn:SearchLayoutFieldsDisplayed'
+
+export interface PicklistEntry {
+    active: boolean;
+    validFor?: maybe<string>;
+    defaultValue: boolean;
+    label?: maybe<string>;
+    value: string;
+}
+
+export interface RecordTypeInfo {
+    available: boolean;
+    defaultRecordTypeMapping: boolean;
+    developerName?: maybe<string>;
+    master: boolean;
+    name: string;
+    recordTypeId: string;
+    urls: Record<string, string>;
+}
+
+export interface NamedLayoutInfo {
+    name: string;
+    urls: Record<string, string>;
+}
+
+export interface ScopeInfo {
+    label: string;
+    name: string;
+}
+
+// From
+// https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_calls_describeglobal_describeglobalresult.htm#!
+
+export interface DescribeGlobalSObjectResult {
     activateable: boolean;
     createable: boolean;
     custom: boolean;
@@ -13,7 +221,7 @@ export interface DescribeGlobalResult {
     feedEnabled: boolean;
     hasSubtypes: boolean;
     isSubtype: boolean;
-    keyPrefix: string;
+    keyPrefix: string | null;
     label: string;
     labelPlural: string;
     layoutable: boolean;
@@ -27,4 +235,11 @@ export interface DescribeGlobalResult {
     triggerable: boolean;
     undeletable: boolean;
     updateable: boolean;
+    urls: Record<string, string>;
+}
+
+export interface DescribeGlobalResult {
+    encoding: string;
+    maxBatchSize: number;
+    sobjects: DescribeGlobalSObjectResult[];
 }
diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index 704bb07655..950bafeb75 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -12,9 +12,11 @@ export * from './api/chatter';
 export * from './api/metadata';
 export * from './batch';
 export * from './bulk';
+export * from './cache';
 export * from './channel';
 export * from './connection';
 export * from './date-enum';
+export * from './describe-result';
 export * from './job';
 export * from './oauth2';
 export * from './promise';
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index c0be86e92c..0ec41ed0fc 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -157,7 +157,7 @@ async function testMetadata(conn: sf.Connection): Promise<void> {
         m.metadataObjects.filter((value: sf.MetadataObject) => value.directoryName === 'pages');
     console.log(`ApexPage?: ${pages[0].xmlName === 'ApexPage'}`);
 
-    const types: sf.ListMetadataQuery[] = [{ type: 'CustomObject', folder: null }];
+    const types: sf.ListMetadataQuery[] = [{ type: 'CustomObject', folder: undefined }];
     md.list(types, '39.0', (err, properties: sf.FileProperties[]) => {
         if (err) {
             console.error('err', err);
@@ -335,7 +335,8 @@ batch.on("response", (rets: sf.BatchResultInfo[]) => {
         if (rets[i].success) {
             console.log(`# ${(i + 1)} loaded successfully, id = ${rets[i].id}`);
         } else {
-            console.log(`# ${(i + 1)} error occurred, message = ${rets[i].errors.join(', ')}`);
+            const errors = rets[i].errors;
+            console.log(`# ${(i + 1)} error occurred, message = ${errors ? errors.join(', ') : ''}`);
         }
     }
 });
@@ -350,3 +351,29 @@ salesforceConnection.streaming.topic("InvoiceStatementUpdates").subscribe((messa
     console.log('Event Created : ' + message.event.createdDate);
     console.log('Object Id : ' + message.sobject.Id);
 });
+
+async function testDescribe() {
+    const global: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal();
+    const globalCached: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal$();
+    const globalCachedCorrectly = global === globalCached;
+
+    globalCached.sobjects.forEach(async (sobject: sf.DescribeGlobalSObjectResult) => {
+        const object: sf.DescribeSObjectResult = await salesforceConnection.describe(sobject.name);
+        const cachedObject: sf.DescribeSObjectResult = await salesforceConnection.describe$(sobject.name);
+
+        object.fields.forEach(field => {
+            const type: sf.FieldType = field.type;
+            // following should never compile
+            // const fail = type === 'hey'
+
+            const isString = type === 'string';
+        });
+
+        // following should never compile (if StrictNullChecks is on)
+        // object.keyPrefix.length;
+
+        console.log(`${sobject.name} Label: `, object.label);
+
+        const correctlyCached = object === cachedObject;
+    });
+}
diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index 2c54d598fc..5e603e5073 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -30,8 +30,12 @@ export class SObject<T> {
     findOne<T>(query?: any, fields?: Object | string[] | string, callback?: (err: Error, ret: T) => void): Query<T>;
     findOne<T>(query?: any, fields?: Object | string[] | string, options?: Object, callback?: (err: Error, ret: T) => void): Query<T>;
 
+    /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
+    approvalLayouts$(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
     approvalLayouts(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
     bulkload(operation: string, options?: { extIdField?: string }, input?: Array<Record<T>> | stream.Stream[] | string[], callback?: (err: Error, ret: RecordResult) => void): Batch;
+    /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
+    compactLayouts$(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     compactLayouts(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise<number>;
     create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
@@ -45,8 +49,12 @@ export class SObject<T> {
     deleted(start: Date | string, end: Date | string, callback?: (info: DeletedRecordsInfo) => void): Promise<DeletedRecordsInfo>;
     deleteHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
+    describe$(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
     insertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    /** Returns a value from the cache if it exists, otherwise calls SObject.layouts */
+    layouts$(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     listview(id: string): ListView;
     listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise<ListViewsInfo>;
diff --git a/types/jsforce/tsconfig.json b/types/jsforce/tsconfig.json
index bf92077cd0..b239e916e7 100644
--- a/types/jsforce/tsconfig.json
+++ b/types/jsforce/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
         "typeRoots": [

From 709a66c5f1058e8744b1dcad3593b889c0bb5fab Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 12:39:58 -0600
Subject: [PATCH 09/64] Add name to contributors

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

diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index 950bafeb75..ddcb0d8260 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -4,6 +4,7 @@
 //                 Kamil Ejsymont <https://github.com/netes>
 //                 Thomas Dvornik <https://github.com/amphro>
 //                 Tim Noonan <https://github.com/tnoonan-salesforce>
+//                 Abraham White <https://github.com/whiteabelincoln>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From c73c567f5620d01cb5cc1fc1434ca45546882057 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 13:00:21 -0600
Subject: [PATCH 10/64] Set strictFunctionTypes to true

---
 types/jsforce/jsforce-tests.ts | 12 ++++++------
 types/jsforce/tsconfig.json    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 0ec41ed0fc..6c3895cae9 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -45,8 +45,8 @@ salesforceConnection.sobject("Account").create({
     Name: "Test Acc 2",
     BillingStreet: "Maplestory street",
     BillingPostalCode: "ME4 666"
-}, (err: Error, ret: sf.RecordResult) => {
-    if (err || !ret.success) {
+}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
+    if (err || !Array.isArray(ret) && !ret.success) {
         return;
     }
 });
@@ -56,8 +56,8 @@ salesforceConnection.sobject("ContentVersion").create({
     Title: 'hello',
     PathOnClient: './hello-world.jpg',
     VersionData: '{ Test: Data }'
-}, (err: Error, ret: sf.RecordResult) => {
-    if (err || !ret.success) {
+}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
+    if (err || !Array.isArray(ret) && !ret.success) {
         return;
     }
 });
@@ -77,8 +77,8 @@ salesforceConnection.sobject("ContentDocumentLink").create({
     ContentDocumentId: '',
     LinkedEntityId: '',
     ShareType: "I"
-}, (err: Error, ret: sf.RecordResult) => {
-    if (err || !ret.success) {
+}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
+    if (err || !Array.isArray(ret) && !ret.success) {
         return;
     }
 });
diff --git a/types/jsforce/tsconfig.json b/types/jsforce/tsconfig.json
index b239e916e7..4d6aee9825 100644
--- a/types/jsforce/tsconfig.json
+++ b/types/jsforce/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 3e7933029419692f7c98222f54f0a07e7824e3bc Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 13:27:25 -0600
Subject: [PATCH 11/64] Remove describeGlobal from SObject

---
 types/jsforce/salesforce-object.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index 5e603e5073..af73962366 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -18,9 +18,6 @@ export class SObject<T> {
     upsert(records: Record<T>, extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult) => void): Promise<RecordResult>;
     upsert(records: Array<Record<T>>, extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult[]) => void): Promise<RecordResult[]>;
     upsertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult[] | BatchResultInfo[]) => void): Batch;
-    describeGlobal(callback: (err: Error, res: any) => void): void;
-    describe$(callback: (err: Error, ret: DescribeSObjectResult) => void): void;
-    describeGlobal$(callback: (err: Error, res: any) => void): void;
 
     find<T>(query?: any, callback?: (err: Error, ret: T[]) => void): Query<T>;
     find<T>(query?: any, fields?: Object | string[] | string, callback?: (err: Error, ret: T[]) => void): Query<T>;

From 6abf5805fee3b7c978bc14bf0e97c1715f5e170b Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 13:49:16 -0600
Subject: [PATCH 12/64] Add proper return types for cached describe calls

The [Cache.makeCacheable](http://jsforce.github.io/jsforce/doc/cache.js.html#line175)
method doesn't return a promise, but immediately
returns the saved value. This is dumb, the method
signature should match the passed in method,
returning an immediately resolved Promise instead.
---
 types/jsforce/connection.d.ts        | 4 ++--
 types/jsforce/salesforce-object.d.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 8f6f50efc5..2f970cc764 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -113,10 +113,10 @@ export abstract class BaseConnection extends EventEmitter {
     destroy<T>(type: string, ids: string | string[], options?: Object,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
-    describe$<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    describe$<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
     describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
-    describeGlobal$<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
+    describeGlobal$<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     sobject<T>(resource: string): SObject<T>;
 }
diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index af73962366..0d8bf52e41 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -28,11 +28,11 @@ export class SObject<T> {
     findOne<T>(query?: any, fields?: Object | string[] | string, options?: Object, callback?: (err: Error, ret: T) => void): Query<T>;
 
     /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
-    approvalLayouts$(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
+    approvalLayouts$(callback?: (layoutInfo: ApprovalLayoutInfo) => void): ApprovalLayoutInfo;
     approvalLayouts(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
     bulkload(operation: string, options?: { extIdField?: string }, input?: Array<Record<T>> | stream.Stream[] | string[], callback?: (err: Error, ret: RecordResult) => void): Batch;
     /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
-    compactLayouts$(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
+    compactLayouts$(callback?: CompactLayoutInfo): CompactLayoutInfo;
     compactLayouts(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise<number>;
     create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
@@ -47,11 +47,11 @@ export class SObject<T> {
     deleteHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
-    describe$(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    describe$(callback?: (err: Error, ret: DescribeSObjectResult) => void): DescribeSObjectResult;
     insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
     insertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     /** Returns a value from the cache if it exists, otherwise calls SObject.layouts */
-    layouts$(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
+    layouts$(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): LayoutInfo;
     layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     listview(id: string): ListView;
     listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise<ListViewsInfo>;

From 13d8a50a57c6ecb33f4b138b70f9c1942a7ecfe3 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 13:59:54 -0600
Subject: [PATCH 13/64] Update tests

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

diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 6c3895cae9..741b1875f7 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -354,12 +354,12 @@ salesforceConnection.streaming.topic("InvoiceStatementUpdates").subscribe((messa
 
 async function testDescribe() {
     const global: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal();
-    const globalCached: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal$();
+    const globalCached: sf.DescribeGlobalResult = salesforceConnection.describeGlobal$();
     const globalCachedCorrectly = global === globalCached;
 
     globalCached.sobjects.forEach(async (sobject: sf.DescribeGlobalSObjectResult) => {
         const object: sf.DescribeSObjectResult = await salesforceConnection.describe(sobject.name);
-        const cachedObject: sf.DescribeSObjectResult = await salesforceConnection.describe$(sobject.name);
+        const cachedObject: sf.DescribeSObjectResult = salesforceConnection.describe$(sobject.name);
 
         object.fields.forEach(field => {
             const type: sf.FieldType = field.type;

From e7e45f53ffa7e8c56935998f637594b636364386 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 14:42:46 -0600
Subject: [PATCH 14/64] Add clear() method to caching describe methods

---
 types/jsforce/connection.d.ts        | 14 ++++++++++----
 types/jsforce/jsforce-tests.ts       |  2 ++
 types/jsforce/salesforce-object.d.ts | 26 +++++++++++++++++++-------
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 2f970cc764..9759d67a9d 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -112,11 +112,17 @@ export abstract class BaseConnection extends EventEmitter {
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     destroy<T>(type: string, ids: string | string[], options?: Object,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
-    /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
-    describe$<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
+    describe$: {
+        /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
+        <T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
+        clear(): void;
+    }
     describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
-    /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
-    describeGlobal$<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
+    describeGlobal$: {
+        /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
+        <T>(callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
+        clear(): void;
+    }
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     sobject<T>(resource: string): SObject<T>;
 }
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 741b1875f7..8eb97aebc7 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -356,10 +356,12 @@ async function testDescribe() {
     const global: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal();
     const globalCached: sf.DescribeGlobalResult = salesforceConnection.describeGlobal$();
     const globalCachedCorrectly = global === globalCached;
+    salesforceConnection.describeGlobal$.clear();
 
     globalCached.sobjects.forEach(async (sobject: sf.DescribeGlobalSObjectResult) => {
         const object: sf.DescribeSObjectResult = await salesforceConnection.describe(sobject.name);
         const cachedObject: sf.DescribeSObjectResult = salesforceConnection.describe$(sobject.name);
+        salesforceConnection.describe$.clear();
 
         object.fields.forEach(field => {
             const type: sf.FieldType = field.type;
diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index 0d8bf52e41..ab3e398891 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -27,12 +27,18 @@ export class SObject<T> {
     findOne<T>(query?: any, fields?: Object | string[] | string, callback?: (err: Error, ret: T) => void): Query<T>;
     findOne<T>(query?: any, fields?: Object | string[] | string, options?: Object, callback?: (err: Error, ret: T) => void): Query<T>;
 
-    /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
-    approvalLayouts$(callback?: (layoutInfo: ApprovalLayoutInfo) => void): ApprovalLayoutInfo;
+    approvalLayouts$: {
+        /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
+        (callback?: (layoutInfo: ApprovalLayoutInfo) => void): ApprovalLayoutInfo;
+        clear(): void;
+    }
     approvalLayouts(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
     bulkload(operation: string, options?: { extIdField?: string }, input?: Array<Record<T>> | stream.Stream[] | string[], callback?: (err: Error, ret: RecordResult) => void): Batch;
-    /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
-    compactLayouts$(callback?: CompactLayoutInfo): CompactLayoutInfo;
+    compactLayouts$: {
+        /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
+        (callback?: CompactLayoutInfo): CompactLayoutInfo;
+        clear(): void;
+    }
     compactLayouts(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise<number>;
     create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
@@ -46,12 +52,18 @@ export class SObject<T> {
     deleted(start: Date | string, end: Date | string, callback?: (info: DeletedRecordsInfo) => void): Promise<DeletedRecordsInfo>;
     deleteHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
-    /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
-    describe$(callback?: (err: Error, ret: DescribeSObjectResult) => void): DescribeSObjectResult;
+    describe$: {
+        /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
+        (callback?: (err: Error, ret: DescribeSObjectResult) => void): DescribeSObjectResult;
+        clear(): void;
+    }
     insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
     insertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     /** Returns a value from the cache if it exists, otherwise calls SObject.layouts */
-    layouts$(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): LayoutInfo;
+    layouts$: {
+        (layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): LayoutInfo;
+        clear(): void;
+    }
     layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     listview(id: string): ListView;
     listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise<ListViewsInfo>;

From 34ff751d0683acaa10d97237f417ba3b0889f240 Mon Sep 17 00:00:00 2001
From: MikeBall0 <mike.ball@mikutech.com>
Date: Wed, 30 May 2018 20:59:20 +0000
Subject: [PATCH 15/64] Fix for issue 25343

Including `& TOwnProps` in `TInjectedProps` for `InferableComponentEnhancerWithProps` causes the `TOwnProps` to need to exist in the extended component, when really those props are defined by the `mapStateToProps`.
---
 types/react-redux/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 0519a43bb5..90ac6c78a7 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -105,17 +105,17 @@ export interface Connect {
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>
-    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp & TOwnProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp, TOwnProps>;
 
     <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TDispatchProps & TOwnProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps & TOwnProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,

From 8e4d4150bde976f21c6177e76cfdbc5788ea9939 Mon Sep 17 00:00:00 2001
From: Danny Cochran <daniel@cochrans.org>
Date: Thu, 31 May 2018 13:07:31 -0700
Subject: [PATCH 16/64] make RequestPromise generic

The default Promise interface is a generic which is useful for specifying your expected return value from the promise resolving.
---
 types/request-promise-native/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/request-promise-native/index.d.ts b/types/request-promise-native/index.d.ts
index 0b5ef4300c..201983dd6e 100644
--- a/types/request-promise-native/index.d.ts
+++ b/types/request-promise-native/index.d.ts
@@ -9,10 +9,10 @@ import request = require('request');
 import http = require('http');
 
 declare namespace requestPromise {
-    interface RequestPromise extends request.Request {
-        then: Promise<any>["then"];
-        catch: Promise<any>["catch"];
-        promise(): Promise<any>;
+    interface RequestPromise<T = any> extends request.Request {
+        then: Promise<T>["then"];
+        catch: Promise<T>["catch"];
+        promise(): Promise<T>;
     }
 
     interface RequestPromiseOptions extends request.CoreOptions {

From c122cd24a649fe9bc80d1a37ad645b9e43710d3b Mon Sep 17 00:00:00 2001
From: James Ide <ide@expo.io>
Date: Thu, 31 May 2018 20:40:05 -0700
Subject: [PATCH 17/64] Fix parameterized type inference for async-retry

The async-retry function has a generic type parameter `A` and TypeScript is unable to infer the concret type when the `bail` function, whose type references the generic type, is specified. Reading the source and API documentation of async-retry, `bail` returns nothing so `void` is the right type here. This in turn fixes inference of the generic type parameter `A`.

Tested by adding some expected return types to the test file. The type checks failed before this commit. With this commit, they pass.
---
 types/async-retry/async-retry-tests.ts | 4 ++--
 types/async-retry/index.d.ts           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/async-retry/async-retry-tests.ts b/types/async-retry/async-retry-tests.ts
index 68327b66bd..20dfc62c4b 100644
--- a/types/async-retry/async-retry-tests.ts
+++ b/types/async-retry/async-retry-tests.ts
@@ -10,12 +10,12 @@ const o: Options = {
   onRetry: (e: Error) => 42
 };
 
-retry(
+const hello: Promise<string> = retry(
   bail => 'hello',
   { retries: 3 }
 );
 
-retry(
+const answer: Promise<number> = retry(
   bail => Promise.resolve(42),
   { retries: 3 }
 );
diff --git a/types/async-retry/index.d.ts b/types/async-retry/index.d.ts
index a2f65e00a4..6b50c71b63 100644
--- a/types/async-retry/index.d.ts
+++ b/types/async-retry/index.d.ts
@@ -19,7 +19,7 @@ declare namespace AsyncRetry {
 		onRetry?: (e: Error) => any;
 	}
 
-	type RetryFunction<A> = (bail: (e: Error) => A, attempt: number) => A|Promise<A>;
+	type RetryFunction<A> = (bail: (e: Error) => void, attempt: number) => A|Promise<A>;
 }
 
 export = AsyncRetry;

From 3354c1bb24e4e6eb1ccc1896d2998faadfb6461b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20Damgaard=20M=C3=B8ller?= <jakobdo@gmail.com>
Date: Fri, 1 Jun 2018 14:57:19 +0200
Subject: [PATCH 18/64] Missing valueFormats in definitions

DiscreteBarChart and MultiBarHorizontalChart is missing the valueFormat(function) version.
---
 types/nvd3/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/nvd3/index.d.ts b/types/nvd3/index.d.ts
index cd60da4b8d..7f92d2410e 100644
--- a/types/nvd3/index.d.ts
+++ b/types/nvd3/index.d.ts
@@ -1698,6 +1698,8 @@ id(value: number|string): this;
         valueFormat(): string;
         /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
         valueFormat(value: string): this;
+		/*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(format: (d: any) => string): this;
         /* The width the graph or component created inside the SVG should be made*/
         width(): number;
         /*The width the graph or component created inside the SVG should be made.*/
@@ -2649,6 +2651,8 @@ id(value: number|string): this;
         valueFormat(): string;
         /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
         valueFormat(value: string): this;
+		/*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(format: (d: any) => string): this;
         /*.*/
         valuePadding(): number;
         /**/

From 14f39d7936c068746bcd89063fc3634a3cb9901b Mon Sep 17 00:00:00 2001
From: Teemu Koivisto <tkoivisto456@gmail.com>
Date: Fri, 1 Jun 2018 16:11:18 +0300
Subject: [PATCH 19/64] Fix missing LabelList typing & update README

---
 types/recharts/README.MD          |  8 ++++++++
 types/recharts/index.d.ts         | 17 +++++++++++++++++
 types/recharts/recharts-tests.tsx | 24 ++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/types/recharts/README.MD b/types/recharts/README.MD
index 063a6dab3c..970e15ec0b 100644
--- a/types/recharts/README.MD
+++ b/types/recharts/README.MD
@@ -2,3 +2,11 @@ Typings for [Recharts](http://recharts.org/), a composable charting library buil
 
 The [Recharts website](https://github.com/recharts/recharts.org) has comprehensive API documentation which is generated from JavaScript files.
 Those files are used as input to generate these typings.
+
+# How to run tests
+
+As of 1.6.2018.
+
+1) Install typescript globally: `npm i -g typescript`
+2) Install React's dependencies: `cd ../react && npm i`
+3) Run tests: `cd ../recharts && tsc`
\ No newline at end of file
diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index ecdcd1f420..d6e4a084a7 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -841,6 +841,23 @@ export interface LabelProps {
     content?: React.ReactElement<any> | ContentRenderer<Label>;
 }
 
+export class LabelList extends React.Component<LabelListProps> { }
+
+export interface LabelListProps {
+    angle?: number;
+    children?: React.ReactNode[] | React.ReactNode;
+    className?: string;
+    clockWise?: boolean;
+    content?: React.ReactElement<any> | ContentRenderer<Label>;
+    data?: number;
+    dataKey: string | number | RechartsFunction;
+    formatter?: LabelFormatter;
+    id?: string;
+    offset?: number;
+    position?: PositionType;
+    valueAccessor?: RechartsFunction;
+}
+
 export type AxisDomain = string | number | ContentRenderer<any> | 'auto' | 'dataMin' | 'dataMax';
 
 export interface XPadding {
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 7eed634119..d76ede7e97 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -4,8 +4,8 @@ import * as ReactDOM from 'react-dom';
 import {
     CartesianGrid, Line, LineChart, PieChart, Pie,
     Sector, XAxis, YAxis, Tooltip, ReferenceLine,
-    ReferenceArea, ResponsiveContainer, Label, Brush,
-    ScatterChart, ZAxis, Legend, Scatter
+    ReferenceArea, ResponsiveContainer, Label, LabelList, Brush,
+    ScatterChart, ZAxis, Legend, Scatter, Bar, BarChart
 } from 'recharts';
 
 interface ComponentState {
@@ -184,6 +184,26 @@ class Component extends React.Component<{}, ComponentState> {
                         <Scatter name="A school" data={data} fill="#8884d8" />
                     </ScatterChart>
                 </ResponsiveContainer>
+                <ResponsiveContainer>
+                    <BarChart
+                        width={730}
+                        height={250}
+                        data={data}
+                        margin={{ top: 15, right: 30, left: 20, bottom: 5 }}
+                    >
+                    <CartesianGrid strokeDasharray="3 3" />
+                    <XAxis dataKey="name">
+                        <Label value="Pages of my website" offset={0} position="insideBottom" />
+                    </XAxis>
+                    <YAxis label='pv of page' />
+                    <Bar dataKey="pv" fill="#8884d8">
+                        <LabelList dataKey="name" position="insideTop" angle={45}  />
+                    </Bar>
+                    <Bar dataKey="uv" fill="#82ca9d">
+                        <LabelList dataKey="uv" position="top" />
+                    </Bar>
+                    </BarChart>
+                </ResponsiveContainer>
             </div>
         );
     }

From 54bca77d2224bda9eda3d54e4c6fa853eb5a0d0a Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Fri, 1 Jun 2018 19:00:04 +0200
Subject: [PATCH 20/64] imperium: Set new methods to public

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

diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index 9ec2ca9c09..f6765eea93 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -33,13 +33,13 @@ export class Imperium {
 
     private addRole(roleName: string, getAcl: GetAcl): void;
 
-    private evaluateRouteActions(req: express.Request, action: Action[], context: Context): Actions;
+    evaluateRouteActions(req: express.Request, action: Action[], context: Context): Actions;
 
-    private evaluateRouteAction(req: express.Request, expr: string, key: string, context: Context): string;
+    evaluateRouteAction(req: express.Request, expr: string, key: string, context: Context): string;
 
-    private evaluateUserActions(req: express.Request, roles: Role[]): Promise<Action[]>;
+    evaluateUserActions(req: express.Request, roles: Role[]): Promise<Action[]>;
 
-    private evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
+    evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
 }
 
 interface Roles {

From 945b7bdd9bdf3a48e901818e52884ee908cb444d Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Fri, 1 Jun 2018 15:05:26 -0500
Subject: [PATCH 21/64] Add typings for yauzl-promise

---
 types/yauzl-promise/index.d.ts             | 61 ++++++++++++++++++++++
 types/yauzl-promise/package.json           |  6 +++
 types/yauzl-promise/tsconfig.json          | 22 ++++++++
 types/yauzl-promise/tslint.json            |  1 +
 types/yauzl-promise/yauzl-promise-tests.ts | 51 ++++++++++++++++++
 5 files changed, 141 insertions(+)
 create mode 100644 types/yauzl-promise/index.d.ts
 create mode 100644 types/yauzl-promise/package.json
 create mode 100644 types/yauzl-promise/tsconfig.json
 create mode 100644 types/yauzl-promise/tslint.json
 create mode 100644 types/yauzl-promise/yauzl-promise-tests.ts

diff --git a/types/yauzl-promise/index.d.ts b/types/yauzl-promise/index.d.ts
new file mode 100644
index 0000000000..9374a62e5c
--- /dev/null
+++ b/types/yauzl-promise/index.d.ts
@@ -0,0 +1,61 @@
+import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader} from 'yauzl';
+import { Readable } from 'stream';
+import { EventEmitter } from 'events';
+
+// This class is not directly compatible with @types/yauzl 's ZipFile as this library changes the function signatures
+// Therefore, it is replaced, albeit with a significant portion
+export class ZipFile extends EventEmitter {
+    // This chunk taken directly from @types/yauzl
+    autoClose: boolean;
+    comment: string;
+    decodeStrings: boolean;
+    emittedError: boolean;
+    entriesRead: number;
+    entryCount: number;
+    fileSize: number;
+    isOpen: boolean;
+    lazyEntries: boolean;
+    readEntryCursor: boolean;
+    validateEntrySizes: boolean;
+
+    constructor(
+        reader: RandomAccessReader,
+        centralDirectoryOffset: number,
+        fileSize: number,
+        entryCount: number,
+        comment: string,
+        autoClose: boolean,
+        lazyEntries: boolean,
+        decodeStrings: boolean,
+        validateEntrySizes: boolean,
+    );
+
+    // These funcitons are custom to yauzl-promise
+
+    close(): Promise<void>;
+    readEntry(): Promise<Entry>;
+    readEntries(numEntries?: number): Promise<Entry[]>;
+    walkEntries(callback: (entry: Entry) => Promise<void> | void, numEntries?: number): Promise<void>;
+    openReadStream(entry: Entry, options?: ZipFileOptions): Promise<Readable>;
+}
+
+export class Entry extends BaseEntry {
+    openReadStream(options?: ZipFileOptions): Promise<Readable>;
+}
+
+
+export function open(path: string, options?: Options): Promise<ZipFile>;
+// export function open(path: string): Promise<ZipFile>;
+export function fromFd(fd: number, options?: Options): Promise<ZipFile>;
+// export function fromFd(fd: number): Promise<ZipFile>;
+export function fromBuffer(buffer: Buffer, options?: Options): Promise<ZipFile>;
+// export function fromBuffer(buffer: Buffer): Promise<ZipFile>;
+export function fromRandomAccessReader(reader: RandomAccessReader, totalSize: number, options?: Options): Promise<ZipFile>;
+// export function fromRandomAccessReader(reader: RandomAccessReader, totalSize: number): Promise<ZipFile>;
+
+// These are copied directly from @types/yauzl, I beleive they are unmodified
+export function dosDateTimeToDate(date: number, time: number): Date;
+export function validateFileName(fileName: string): string | null;
+
+
+export { RandomAccessReader, Options, ZipFileOptions }
\ No newline at end of file
diff --git a/types/yauzl-promise/package.json b/types/yauzl-promise/package.json
new file mode 100644
index 0000000000..747879f783
--- /dev/null
+++ b/types/yauzl-promise/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/yauzl": "^2.9.0"
+    }
+}
diff --git a/types/yauzl-promise/tsconfig.json b/types/yauzl-promise/tsconfig.json
new file mode 100644
index 0000000000..73510344fe
--- /dev/null
+++ b/types/yauzl-promise/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yauzl-promise-tests.ts"
+    ]
+}
diff --git a/types/yauzl-promise/tslint.json b/types/yauzl-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yauzl-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yauzl-promise/yauzl-promise-tests.ts b/types/yauzl-promise/yauzl-promise-tests.ts
new file mode 100644
index 0000000000..6d7ed97298
--- /dev/null
+++ b/types/yauzl-promise/yauzl-promise-tests.ts
@@ -0,0 +1,51 @@
+import * as yauzl from 'yauzl-promise';
+
+class FakeRaR extends yauzl.RandomAccessReader {
+
+}
+
+const options: yauzl.Options = {
+    autoClose: true
+};
+
+const zipOptions: yauzl.ZipFileOptions = {
+    decrypt: true,
+    decompress: true,
+    start: 0,
+    end: 1
+};
+
+const date = yauzl.dosDateTimeToDate(1, 1);
+const fn = yauzl.validateFileName("fake");
+
+async function test() {
+    const zip = await yauzl.open("");
+    const open2 = await yauzl.open("", options);
+
+    const fd1 = await yauzl.fromFd(0);
+    const fd2 = await yauzl.fromFd(0, options);
+
+    const buffer1 = await yauzl.fromBuffer(Buffer.from("test", "utf-8"));
+    const buffer2 = await yauzl.fromBuffer(Buffer.from("test", "utf-8"), options);
+
+    const rar1 = await yauzl.fromRandomAccessReader(new FakeRaR(), 1);
+    const rar2 = await yauzl.fromRandomAccessReader(new FakeRaR(), 1, options);
+
+    const entry = await zip.readEntry();
+    await zip.readEntries();
+    await zip.readEntries(1);
+
+    const rs = await zip.openReadStream(entry);
+    await zip.openReadStream(entry, zipOptions);
+
+    await entry.openReadStream();
+    await entry.openReadStream(zipOptions);
+
+    await zip.walkEntries(async (entry: yauzl.Entry) => {
+        console.log("foo");
+    });
+
+    await zip.walkEntries(async (entry: yauzl.Entry) => {
+        console.log("foo");
+    }, 1);
+}

From ea6a794194004c55af94ee03e05e76b25999b53a Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Fri, 1 Jun 2018 15:20:18 -0500
Subject: [PATCH 22/64] fix lint issues, add header

---
 types/yauzl-promise/index.d.ts             | 15 +++++++++++----
 types/yauzl-promise/tsconfig.json          |  1 +
 types/yauzl-promise/yauzl-promise-tests.ts |  4 +---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/types/yauzl-promise/index.d.ts b/types/yauzl-promise/index.d.ts
index 9374a62e5c..b859d8891e 100644
--- a/types/yauzl-promise/index.d.ts
+++ b/types/yauzl-promise/index.d.ts
@@ -1,4 +1,13 @@
-import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader} from 'yauzl';
+// Type definitions for yauzl-promise 2.1
+// Project: https://github.com/overlookmotel/yauzl-promise
+// Definitions by: Dave Lee <https://github.com/dlee-nvisia>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from 'yauzl';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';
 
@@ -43,7 +52,6 @@ export class Entry extends BaseEntry {
     openReadStream(options?: ZipFileOptions): Promise<Readable>;
 }
 
-
 export function open(path: string, options?: Options): Promise<ZipFile>;
 // export function open(path: string): Promise<ZipFile>;
 export function fromFd(fd: number, options?: Options): Promise<ZipFile>;
@@ -57,5 +65,4 @@ export function fromRandomAccessReader(reader: RandomAccessReader, totalSize: nu
 export function dosDateTimeToDate(date: number, time: number): Date;
 export function validateFileName(fileName: string): string | null;
 
-
-export { RandomAccessReader, Options, ZipFileOptions }
\ No newline at end of file
+export { RandomAccessReader, Options, ZipFileOptions };
diff --git a/types/yauzl-promise/tsconfig.json b/types/yauzl-promise/tsconfig.json
index 73510344fe..86c1696468 100644
--- a/types/yauzl-promise/tsconfig.json
+++ b/types/yauzl-promise/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/yauzl-promise/yauzl-promise-tests.ts b/types/yauzl-promise/yauzl-promise-tests.ts
index 6d7ed97298..0a33ad6440 100644
--- a/types/yauzl-promise/yauzl-promise-tests.ts
+++ b/types/yauzl-promise/yauzl-promise-tests.ts
@@ -1,8 +1,6 @@
 import * as yauzl from 'yauzl-promise';
 
-class FakeRaR extends yauzl.RandomAccessReader {
-
-}
+class FakeRaR extends yauzl.RandomAccessReader {}
 
 const options: yauzl.Options = {
     autoClose: true

From 9a0c840e20cc95cc368cc61af802f993e99de426 Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Fri, 1 Jun 2018 15:26:00 -0500
Subject: [PATCH 23/64] travis says that I shouldn't use a package.json for a
 @types dependency. Use relative path instead?

---
 types/yauzl-promise/index.d.ts   | 2 +-
 types/yauzl-promise/package.json | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 types/yauzl-promise/package.json

diff --git a/types/yauzl-promise/index.d.ts b/types/yauzl-promise/index.d.ts
index b859d8891e..ed84f3273c 100644
--- a/types/yauzl-promise/index.d.ts
+++ b/types/yauzl-promise/index.d.ts
@@ -7,7 +7,7 @@
 
 /// <reference types="node" />
 
-import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from 'yauzl';
+import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from '../yauzl';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';
 
diff --git a/types/yauzl-promise/package.json b/types/yauzl-promise/package.json
deleted file mode 100644
index 747879f783..0000000000
--- a/types/yauzl-promise/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "@types/yauzl": "^2.9.0"
-    }
-}

From 25c3781cfe19ad8e5cba50d26ea732ddc839239d Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Fri, 1 Jun 2018 15:34:42 -0500
Subject: [PATCH 24/64] Travis has informed that relative paths are wrong too.
 3rd time is the charm?

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

diff --git a/types/yauzl-promise/index.d.ts b/types/yauzl-promise/index.d.ts
index ed84f3273c..b859d8891e 100644
--- a/types/yauzl-promise/index.d.ts
+++ b/types/yauzl-promise/index.d.ts
@@ -7,7 +7,7 @@
 
 /// <reference types="node" />
 
-import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from '../yauzl';
+import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from 'yauzl';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';
 

From d080b3fd445921d1a1b51090c13caa1b485ea975 Mon Sep 17 00:00:00 2001
From: Thomas Chia <thomas.h.chia@googlemail.com>
Date: Sat, 2 Jun 2018 12:01:59 +0800
Subject: [PATCH 25/64] Options are spread into props.

---
 types/react-stripe-elements/index.d.ts                      | 2 +-
 types/react-stripe-elements/react-stripe-elements-tests.tsx | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index fa68cb1b31..e8e88757b2 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -30,7 +30,7 @@ export namespace ReactStripeElements {
 	interface StripeProviderOptions {
 		stripeAccount?: string;
 	}
-	type StripeProviderProps = { apiKey: string; stripe?: never; options?: StripeProviderOptions } | { apiKey?: never; stripe: StripeProps | null; options?: StripeProviderOptions; };
+	type StripeProviderProps = { apiKey: string; stripe?: never; } & StripeProviderOptions | { apiKey?: never; stripe: StripeProps | null; } & StripeProviderOptions;
 
 	interface StripeProps {
 		createSource(sourceData?: SourceOptions): Promise<SourceResponse>;
diff --git a/types/react-stripe-elements/react-stripe-elements-tests.tsx b/types/react-stripe-elements/react-stripe-elements-tests.tsx
index 575987a1d9..ef1af5fa86 100644
--- a/types/react-stripe-elements/react-stripe-elements-tests.tsx
+++ b/types/react-stripe-elements/react-stripe-elements-tests.tsx
@@ -197,6 +197,7 @@ const TestStripeProviderProps3: React.SFC<{
 }> = props => <StripeProvider stripe={null} />;
 
 /**
- * StripeProvider should be able to accept an `options` prop
+ * StripeProvider should be able to accept options.
+ * See: https://stripe.com/docs/stripe-js/reference#stripe-function for options.
  */
-const TestStripeProviderOptions: React.SFC = () => <StripeProvider apiKey="" options={{stripeAccount: ""}} />;
+const TestStripeProviderOptions: React.SFC = () => <StripeProvider apiKey="" stripeAccount="" />;

From 76e8c2a450b398508249fa27b3a1fd1e8699e7f1 Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Sat, 2 Jun 2018 05:08:29 +0100
Subject: [PATCH 26/64] Allow either HTTP or HTTPS server

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

diff --git a/types/webpack-hot-client/index.d.ts b/types/webpack-hot-client/index.d.ts
index 337581fedb..295e6819be 100644
--- a/types/webpack-hot-client/index.d.ts
+++ b/types/webpack-hot-client/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types="node" />
 
 import * as webpack from 'webpack';
-import * as http from 'http';
+import * as net from 'net';
 
 export = WebpackHotClient;
 
@@ -44,7 +44,7 @@ declare namespace WebpackHotClient {
     /** Reload the page if a patch cannot be applied by webpack */
     reload?: boolean;
     /** Server instance for webpack-hot-client to connect to */
-    server?: http.Server;
+    server?: net.Server;
     /** Webpack stats configuration */
     stats?: webpack.Options.Stats;
   }

From 992f00693a6d6f0bb9c29cd7689bc477c8bec588 Mon Sep 17 00:00:00 2001
From: Maciek Blim <m.blim@binarapps.com>
Date: Sat, 2 Jun 2018 10:02:57 +0200
Subject: [PATCH 27/64] optional `key` param for `createPortal`

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

diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index bd9541217d..e7a5afe59d 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -19,7 +19,7 @@ import {
 export function findDOMNode(instance: ReactInstance): Element | null | Text;
 export function unmountComponentAtNode(container: Element): boolean;
 
-export function createPortal(children: ReactNode, container: Element): ReactPortal;
+export function createPortal(children: ReactNode, container: Element, key?: null | string): ReactPortal;
 
 export const version: string;
 export const render: Renderer;
diff --git a/types/react-dom/react-dom-tests.tsx b/types/react-dom/react-dom-tests.tsx
index 3f153b0a75..ff5ef5850e 100644
--- a/types/react-dom/react-dom-tests.tsx
+++ b/types/react-dom/react-dom-tests.tsx
@@ -42,7 +42,14 @@ describe('ReactDOM', () => {
             }
         }
 
-        ReactDOM.createPortal(React.createElement('div'), portalTarget);
+        ReactDOM.createPortal(<div />, document.createElement('div'));
+        ReactDOM.createPortal(<div />, document.createElement('div'), null);
+        ReactDOM.createPortal(<div />, document.createElement('div'), 'key');
+
+        ReactDOM.createPortal(React.createElement('div'), document.createElement('div'));
+        ReactDOM.createPortal(React.createElement('div'), document.createElement('div'), null);
+        ReactDOM.createPortal(React.createElement('div'), document.createElement('div'), 'key');
+
         ReactDOM.render(<ClassComponent />, rootElement);
     });
 });

From d2b232d5e94150fd49bbc6ea986f6bfaf195328e Mon Sep 17 00:00:00 2001
From: Errietta Kostala <errietta@errietta.me>
Date: Sat, 2 Jun 2018 19:41:05 +0100
Subject: [PATCH 28/64] Update openpgp.js type definitions to match module

---
 types/openpgp/index.d.ts       | 275 ++++++++++++++++++++++++---------
 types/openpgp/openpgp-tests.ts |  45 ++----
 2 files changed, 211 insertions(+), 109 deletions(-)

diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index 79e92daa7f..6c8e073c04 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -1,22 +1,73 @@
 // Type definitions for openpgpjs
 // Project: http://openpgpjs.org/
 // Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
+//                 Errietta Kostala <https://github.com/errietta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace openpgp;
 
-export interface KeyPair {
+export interface UserId {
+    name?: string,
+    email?: string,
+}
+
+export interface SessionKey  {
+    data: Uint8Array,
+    algorithm: string
+}
+
+export interface EncryptOptions {
+    data: string|Uint8Array,
+    dataType?: 'utf8'|'binary'|'text'|'mime',
+    publicKeys?: key.Key | key.Key[],
+    privateKeys?: key.Key | key.Key[],
+    passwords?: string|string[],
+    sessionKey?: SessionKey,
+    filename?: string,
+    compression?: enums.compression,
+    armor?: boolean,
+    detached?: boolean,
+    signature?: Signature,
+    returnSessionKey?: boolean,
+    wildcard?: boolean,
+    date?: Date,
+    fromUserId?: UserId,
+    toUserId?: UserId,
+}
+
+export interface EncryptedMessage {
+    data: string,
+    message: string,
+}
+
+export interface DecryptOptions {
+    message: message.Message,
+    privateKeys?: key.Key | key.Key[],
+    passwords?: string | string[],
+    sessionKeys?: SessionKey | SessionKey[],
+    publicKeys?: key.Key | key.Key[],
+    format?: string,
+    signature?: Signature,
+    date?: Date,
+}
+
+export interface KeyContainer {
     key: key.Key,
+}
+
+export interface KeyPair extends KeyContainer {
     privateKeyArmored: string,
     publicKeyArmored: string
 }
 
 export interface KeyOptions {
-    keyType?: enums.publicKey,
-    numBits: number,
-    userId: string,
-    passphrase: string,
-    unlocked?: boolean
+    userIds?: UserId[],
+    passphrase?: string,
+    numBits?: number,
+    keyExpirationTime?: number,
+    curve?: string,
+    date?: Date,
+    subkeys?: KeyOptions[]
 }
 
 export interface Keyid {
@@ -29,91 +80,153 @@ export interface Signature {
 }
 
 export interface VerifiedMessage {
-    text: string,
-    signatures: Array<Signature>
+    data: Uint8Array|string,
+    signatures: Array<Signature>,
+    filename: string,
 }
 
-/** Decrypts message and verifies signatures
+export interface OpenPGPWorker {
+    randomCallback(): void;
+    configure(config: any): void;
+    seedRandom(buffer: ArrayBuffer): void;
+    delegate(id: number, method: string, options: any): void;
+    response(event: any): void;
+}
 
-    @param privateKey private key with decrypted secret key data
-    @param publicKeys array of keys to verify signatures
-    @param msg the message object with signed and encrypted data
-    */
-export function decryptAndVerifyMessage(privateKey: key.Key, publicKeys: Array<key.Key>, msg: string): Promise<VerifiedMessage>;
-/** Decrypts message and verifies signatures
+export interface WorkerOptions {
+    path?: string,
+    n?: number,
+    workers?: OpenPGPWorker[],
+    config?: any,
+}
 
-    @param privateKey private key with decrypted secret key data
-    @param publicKey single key to verify signatures
-    @param msg the message object with signed and encrypted data
-    */
-export function decryptAndVerifyMessage(privateKey: key.Key, publicKey: key.Key, msg: string): Promise<VerifiedMessage>;
+export class AsyncProxy {
+    constructor(options: WorkerOptions);
+    getId(): number;
+    seedRandom(workerId: number, size: number): Promise<void>;
+    terminate(): void;
+    delegate(method: string, options: any): void;
 
-/** Decrypts message
+    workers: OpenPGPWorker[];
+}
 
-    @param privateKey private key with decrypted secret key data
-    @param msg the message object with the encrypted data
-    */
-export function decryptMessage(privateKey: key.Key, msg: message.Message): Promise<string>;
+/**
+ * Set the path for the web worker script and create an instance of the async proxy
+ * @param {String} path            relative path to the worker scripts, default: 'openpgp.worker.js'
+ * @param {Number} n               number of workers to initialize
+ * @param {Array<Object>} workers  alternative to path parameter: web workers initialized with 'openpgp.worker.js'
+ */
+export function initWorker(options: WorkerOptions): boolean;
 
-/** Encrypts message text with keys
-    @param keys array of keys used to encrypt the message
-    @param text message as native JavaScript string
-    @returns encrypted ASCII armored message
-    */
-export function encryptMessage(keys: Array<key.Key>, message: string): Promise<string>;
-/** Encrypts message text with keys
+/**
+ * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
+ * @returns {module:worker/async_proxy.AsyncProxy|null} the async proxy or null if not initialized
+ */
+export function getWorker(): AsyncProxy;
 
-    @param single key used to encrypt the message
-    @param text message as native JavaScript string
-    */
-export function encryptMessage(key: key.Key, message: string): Promise<string>;
+/**
+ * Cleanup the current instance of the web worker.
+ */
+export function destroyWorker(): void;
 
-/** Generates a new OpenPGP key pair. Currently only supports RSA keys. Primary and subkey will be of same type.
-    @param options
-    */
-export function generateKeyPair(options: KeyOptions): Promise<KeyPair>;
+/**
+ * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
+ *   must be specified. If private keys are specified, those will be used to sign the message.
+ * @param  {String|Uint8Array} data               text/data to be encrypted as JavaScript binary string or Uint8Array
+ * @param  {utf8|binary|text|mime} dataType       (optional) data packet type
+ * @param  {Key|Array<Key>} publicKeys            (optional) array of keys or single key, used to encrypt the message
+ * @param  {Key|Array<Key>} privateKeys           (optional) private keys for signing. If omitted message will not be signed
+ * @param  {String|Array<String>} passwords       (optional) array of passwords or a single password to encrypt the message
+ * @param  {Object} sessionKey                    (optional) session key in the form: { data:Uint8Array, algorithm:String }
+ * @param  {String} filename                      (optional) a filename for the literal data packet
+ * @param  {module:enums.compression} compression (optional) which compression algorithm to compress the message with, defaults to what is specified in config
+ * @param  {Boolean} armor                        (optional) if the return values should be ascii armored or the message/signature objects
+ * @param  {Boolean} detached                     (optional) if the signature should be detached (if true, signature will be added to returned object)
+ * @param  {Signature} signature                  (optional) a detached signature to add to the encrypted message
+ * @param  {Boolean} returnSessionKey             (optional) if the unencrypted session key should be added to returned object
+ * @param  {Boolean} wildcard                     (optional) use a key ID of 0 instead of the public key IDs
+ * @param  {Date} date                            (optional) override the creation date of the message and the message signature
+ * @param  {Object} fromUserId                    (optional) user ID to sign with, e.g. { name:'Steve Sender', email:'steve@openpgp.org' }
+ * @param  {Object} toUserId                      (optional) user ID to encrypt for, e.g. { name:'Robert Receiver', email:'robert@openpgp.org' }
+ * @returns {Promise<Object>}                      encrypted (and optionally signed message) in the form:
+ *                                                  {data: ASCII armored message if 'armor' is true,
+ *                                                  message: full Message object if 'armor' is false, signature: detached signature if 'detached' is true}
+ * @async
+ * @static
+ */
+export function encrypt(options: EncryptOptions): Promise<EncryptedMessage>;
 
-/** Signs message text and encrypts it
+/**
+ * Decrypts a message with the user's private key, a session key or a password. Either a private key,
+ *   a session key or a password must be specified.
+ * @param  {Message} message                  the message object with the encrypted data
+ * @param  {Key|Array<Key>} privateKeys       (optional) private keys with decrypted secret key data or session key
+ * @param  {String|Array<String>} passwords   (optional) passwords to decrypt the message
+ * @param  {Object|Array<Object>} sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String }
+ * @param  {Key|Array<Key>} publicKeys        (optional) array of public keys or single key, to verify signatures
+ * @param  {String} format                    (optional) return data format either as 'utf8' or 'binary'
+ * @param  {Signature} signature              (optional) detached signature for verification
+ * @param  {Date} date                        (optional) use the given date for verification instead of the current time
+ * @returns {Promise<Object>}             decrypted and verified message in the form:
+ *                                         { data:Uint8Array|String, filename:String, signatures:[{ keyid:String, valid:Boolean }] }
+ * @async
+ * @static
+ */
+export function decrypt(options: DecryptOptions): Promise<VerifiedMessage>;
 
-    @param publicKeys array of keys used to encrypt the message
-    @param privateKey private key with decrypted secret key data for signing
-    @param text private key with decrypted secret key data for signing
-    */
-export function signAndEncryptMessage(publicKeys: Array<key.Key>, privateKey: key.Key, text: string): Promise<string>;
-/** Signs message text and encrypts it
+/**
+ * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
+ * @param  {Array<Object>} userIds   array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+ * @param  {String} passphrase       (optional) The passphrase used to encrypt the resulting private key
+ * @param  {Number} numBits          (optional) number of bits for RSA keys: 2048 or 4096.
+ * @param  {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
+ * @param  {String} curve            (optional) elliptic curve for ECC keys:
+ *                                              curve25519, p256, p384, p521, secp256k1,
+ *                                              brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
+ * @param  {Date} date               (optional) override the creation date of the key and the key signatures
+ * @param  {Array<Object>} subkeys   (optional) options for each subkey, default to main key options. e.g. [{sign: true, passphrase: '123'}]
+ *                                              sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+ * @returns {Promise<Object>}         The generated key object in the form:
+ *                                     { key:Key, privateKeyArmored:String, publicKeyArmored:String }
+ * @async
+ * @static
+ */
+export function generateKey(options: KeyOptions): Promise<KeyPair>;
 
-    @param publicKeys single key used to encrypt the message
-    @param privateKey private key with decrypted secret key data for signing
-    @param text private key with decrypted secret key data for signing
-    */
-export function signAndEncryptMessage(publicKey: key.Key, privateKey: key.Key, text: string): Promise<string>;
+/**
+ * Reformats signature packets for a key and rewraps key object.
+ * @param  {Key} privateKey          private key to reformat
+ * @param  {Array<Object>} userIds   array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+ * @param  {String} passphrase       (optional) The passphrase used to encrypt the resulting private key
+ * @param  {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
+ * @returns {Promise<Object>}         The generated key object in the form:
+ *                                     { key:Key, privateKeyArmored:String, publicKeyArmored:String }
+ * @async
+ * @static
+ */
+export function reformatKey(options: {
+    privateKey: key.Key,
+    userIds?: UserId[],
+    passphrase?: string,
+    keyExpirationTime?: number,
+}): Promise<KeyPair>;
 
-/** Signs a cleartext message
-
-    @param privateKeys array of keys with decrypted secret key data to sign cleartext
-    @param text cleartext
-    */
-export function signClearMessage(privateKeys: Array<key.Key>, text: string): Promise<string>;
-/** Signs a cleartext message
-
-    @param privateKeys single key with decrypted secret key data to sign cleartext
-    @param text cleartext
-    */
-export function signClearMessage(privateKey: key.Key, text: string): Promise<string>;
-
-/** Verifies signatures of cleartext signed message
-
-    @param publicKeys array of keys to verify signatures
-    @param msg cleartext message object with signatures
-    */
-export function verifyClearSignedMessage(publicKeys: Array<key.Key>, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
-/** Verifies signatures of cleartext signed message
-
-    @param publicKeys single key to verify signatures
-    @param msg cleartext message object with signatures
-    */
-export function verifyClearSignedMessage(publicKey: key.Key, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
+/**
+ * Unlock a private key with your passphrase.
+ * @param  {Key} privateKey                    the private key that is to be decrypted
+ * @param  {String|Array<String>} passphrase   the user's passphrase(s) chosen during key generation
+ * @returns {Promise<Object>}                  the unlocked key object in the form: { key:Key }
+ * @async
+ */
+export function decryptKey(options: {
+    privateKey: key.Key,
+    passphrase?: string | string[],
+}): Promise<KeyContainer>;
 
+export function encryptKey(options: {
+    privateKey: key.Key,
+    passphrase?: string
+}): Promise<KeyContainer>;
 
 export namespace armor {
     /** Armor an OpenPGP binary packet block
@@ -471,6 +584,14 @@ export namespace message {
         @param armoredText text to be parsed
      */
     function readArmored(armoredText: string): Message;
+
+    /**
+     * reads an OpenPGP message as byte array and returns a message object
+     * @param {Uint8Array} input   binary message
+     * @returns {Message}           new message object
+     * @static
+     */
+    function read(data: Uint8Array): Message;
 }
 
 export namespace packet {
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index fbe8a2e691..3bd3551d0b 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -2,11 +2,14 @@
 
 var options: openpgp.KeyOptions = {
     numBits: 2048,
-    userId: 'Jon Smith <jon.smith@example.org>',
+    userIds: [{
+        name: 'Jon Smith',
+        email: 'jon.smith@example.org',
+    }],
     passphrase: 'super long and hard to guess secret'
 };
 
-openpgp.generateKeyPair(options).then(function (keypair) {
+openpgp.generateKey(options).then(function (keypair) {
     // success
     var privkey = keypair.privateKeyArmored;
     var pubkey = keypair.publicKeyArmored;
@@ -18,14 +21,15 @@ openpgp.generateKeyPair(options).then(function (keypair) {
 var spubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
 var publicKey = openpgp.key.readArmored(spubkey);
 
-openpgp.encryptMessage(publicKey.keys, 'Hello, World!').then(function (pgpMessage) {
+openpgp.encrypt({
+    data: 'Hello, World!',
+    publicKeys: publicKey.keys
+}).then(function (pgpMessage) {
     // success
 }).catch(function (error) {
     // failure
 });
 
-
-
 var sprivkey = '-----BEGIN PGP PRIVATE KEY BLOCK ... END PGP PRIVATE KEY BLOCK-----';
 var privateKey = openpgp.key.readArmored(sprivkey).keys[0];
 privateKey.decrypt('passphrase');
@@ -33,7 +37,10 @@ privateKey.decrypt('passphrase');
 var pgpMessageStr = '-----BEGIN PGP MESSAGE ... END PGP MESSAGE-----';
 var pgpMessage = openpgp.message.readArmored(pgpMessageStr);
 
-openpgp.decryptMessage(privateKey, pgpMessage).then(function (plaintext) {
+openpgp.decrypt({
+    privateKeys: privateKey,
+    message: pgpMessage
+}).then(function (plaintext) {
     // success
 }).catch(function (error) {
     // failure
@@ -44,35 +51,9 @@ openpgp.decryptMessage(privateKey, pgpMessage).then(function (plaintext) {
 
 
 var keyoptions: openpgp.KeyOptions;
-var key= openpgp.key.generate(keyoptions);
-var keys: Array<openpgp.key.Key>;
-var message = openpgp.message.readArmored("");
-var cleartextmessage = openpgp.cleartext.readArmored("");
 var mpi: openpgp.crypto.Mpi;
 var mpis: Array<openpgp.crypto.Mpi>;
 
-
-openpgp.decryptAndVerifyMessage(key, key, "").then();
-openpgp.decryptAndVerifyMessage(key, keys, "").then();
-
-openpgp.decryptMessage(key, message).then();
-
-openpgp.encryptMessage(key, "").then();
-openpgp.encryptMessage(keys, "").then();
-
-openpgp.generateKeyPair(keyoptions).then(function (keypair) {
-    key = keypair.key;
-});
-
-openpgp.signAndEncryptMessage(key, key, "").then();
-openpgp.signAndEncryptMessage(keys, key, "").then();
-
-openpgp.signClearMessage(key, "").then();
-openpgp.signClearMessage(keys, "").then();
-
-openpgp.verifyClearSignedMessage(key, cleartextmessage);
-openpgp.verifyClearSignedMessage(keys, cleartextmessage);
-
 openpgp.armor.armor(openpgp.enums.armor.message, {}, 0, 1);
 openpgp.armor.dearmor("");
 

From 95a21a21523c959362df64596f2f7aed386060c9 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 12:55:20 -0700
Subject: [PATCH 29/64] combine 2 Document interface declarations into 1

---
 types/office-js/index.d.ts | 111 ++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 09d19de4ed..0bb0bbf539 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -2038,6 +2038,60 @@ declare namespace Office {
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setSelectedDataAsync(data: string | TableData | any[][], options?: SetSelectedDataOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get Project field (Ex. ProjectWebAccessURL).
+         * @param fieldId Project level fields.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getProjectFieldAsync(fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get resource field for provided resource Id. (Ex.ResourceName)
+         * @param resourceId Either a string or value of the Resource Id.
+         * @param fieldId Resource Fields.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getResourceFieldAsync(resourceId: string, fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the current selected Resource's Id.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getSelectedResourceAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the current selected Task's Id.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getSelectedTaskAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the current selected View Type (Ex. Gantt) and View Name.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getSelectedViewAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
+         * @param taskId Either a string or value of the Task Id.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getTaskAsync(taskId: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get task field for provided task Id. (Ex. StartDate).
+         * @param taskId Either a string or value of the Task Id.
+         * @param fieldId Task Fields.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getTaskFieldAsync(taskId: string, fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the WSS Url and list name for the Tasks List, the MPP is synced too.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         */
+        getWSSUrlAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
      * Provides information about the document that raised the SelectionChanged event.
@@ -4668,63 +4722,6 @@ declare namespace Office {
          */
         Timeline
     }
-    // Objects
-    interface Document {
-        /**
-         * Get Project field (Ex. ProjectWebAccessURL).
-         * @param fieldId Project level fields.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getProjectFieldAsync(fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get resource field for provided resource Id. (Ex.ResourceName)
-         * @param resourceId Either a string or value of the Resource Id.
-         * @param fieldId Resource Fields.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getResourceFieldAsync(resourceId: string, fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected Resource's Id.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getSelectedResourceAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected Task's Id.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getSelectedTaskAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected View Type (Ex. Gantt) and View Name.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getSelectedViewAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
-         * @param taskId Either a string or value of the Task Id.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getTaskAsync(taskId: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get task field for provided task Id. (Ex. StartDate).
-         * @param taskId Either a string or value of the Task Id.
-         * @param fieldId Task Fields.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getTaskFieldAsync(taskId: string, fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the WSS Url and list name for the Tasks List, the MPP is synced too.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        getWSSUrlAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-    }
 }
 
 

From 126931b38a2e92fc14fd116a6b97a56b2678e21f Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 12:58:24 -0700
Subject: [PATCH 30/64] delete unused Index enum

---
 types/office-js/index.d.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 0bb0bbf539..544244033d 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1249,12 +1249,6 @@ declare namespace Office {
          */
         Index
     }
-    enum Index {
-        First,
-        Last,
-        Next,
-        Previous
-    }
     /**
      * Specifies whether to select (highlight) the location to navigate to (when using the Document.goToByIdAsync method).
      *

From cfbdc0c88dccc5e87168cebfdc3434339d591246 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:17:10 -0700
Subject: [PATCH 31/64] add param descriptions to Worksheet.copy method

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 544244033d..a23df780aa 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -9898,15 +9898,11 @@ declare namespace Excel {
          * Copy a worksheet and place it at the specified position. Return the copied worksheet.
          *
          * [Api set: ExcelApi 1.7]
+         * 
+         * @param positionType Specifies where to put the copy relative to the worksheet specified in relativeTo param. Can be Excel.WorksheetPositionType or string equivalent. Must not be Excel.WorksheetPositionType.none or "None".
+         * @param relativeTo Specifies the worksheet that is the basis for intepreting the positionType param. If not specified, the worksheet on which the copy() is called is assumed.
          */
-        copy(positionType?: Excel.WorksheetPositionType, relativeTo?: Excel.Worksheet): Excel.Worksheet;
-        /**
-         *
-         * Copy a worksheet and place it at the specified position. Return the copied worksheet.
-         *
-         * [Api set: ExcelApi 1.7]
-         */
-        copy(positionType?: "None" | "Before" | "After" | "Beginning" | "End", relativeTo?: Excel.Worksheet): Excel.Worksheet;
+        copy(positionType?: Excel.WorksheetPositionType | string, relativeTo?: Excel.Worksheet): Excel.Worksheet;
         /**
          *
          * Deletes the worksheet from the workbook.

From 4030bb3310ae029514b781e380c061e7deebd073 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:39:10 -0700
Subject: [PATCH 32/64] add declaration for CustomXMLNodeType enum

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index a23df780aa..81255ee7de 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1110,6 +1110,44 @@ declare namespace Office {
          */
         ReadWrite
     }
+    /**
+     * Specifies the type of the XML node.
+     *
+     * @remarks
+     * Hosts: Word
+     * 
+     * Available in Requirement set: CustomXmlParts
+     */
+    enum CustomXMLNodeType {
+        /**
+         * The node is an attribute.
+         */
+        Attribute,
+        /**
+         * The node is CData.
+         */
+        CData,
+        /**
+         * The node is a comment.
+         */
+        NodeComment,
+        /**
+         * The node is an element.
+         */
+        Element,
+        /**
+         * The node is a Document element.
+         */
+        NodeDocument,
+        /**
+         * The node is a processing instruction.
+         */
+        ProcessingInstruction,
+        /**
+         * The node is text.
+         */
+        Text,
+    }
     /**
      * Specifies the kind of event that was raised. Returned by the type property of an EventNameEventArgs object.
      *

From 0db596b272001998a58714c80ee52b4271397e4c Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:44:12 -0700
Subject: [PATCH 33/64] Fix grammar of commerceAllowed description

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 81255ee7de..a89677274c 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -413,7 +413,7 @@ declare namespace Office {
         */
         auth: Auth;
         /**
-         * True if developers can display, on the current platform, a UI in the add-in sell or upgrade; otherwise returns False.
+         * True, if the current platform allows the add-in to  display a UI for selling or upgrading; otherwise returns False.
          * 
          * @remarks
          * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on the Windows desktop or for Office Online in the browser, do allow such links. If you want the UI of your add-in to provide a link to an external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.

From a9c07b88a9e4b767d2b5b230febf6d17de5f8236 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:47:11 -0700
Subject: [PATCH 34/64] typo in RangeCoordinates description

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index a89677274c..77a65318b0 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -772,7 +772,7 @@ declare namespace Office {
          format: object
     }
     /**
-     * Specifies a cell, or row, or column, by its zero-based row and/or column number. Example: {row: 4, column: 3} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
+     * Specifies a cell, or row, or column, by its zero-based row and/or column number. Example: {row: 3, column: 4} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
      */
     interface RangeCoordinates {
         /**

From cb8cd31195a03f73e99b07bc55d7864089501383 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:50:14 -0700
Subject: [PATCH 35/64] remove columns property from
 AddBindingFromNamedItemOptions interface

---
 types/office-js/index.d.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 77a65318b0..05ffc588a9 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -805,10 +805,6 @@ declare namespace Office {
          * The unique ID of the binding. Autogenerated if not supplied.
          */
         id?: string
-        /**
-         * The names of the columns involved in the binding.
-         */
-        columns?: Array<string>
         /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */

From 349529dbe770f8d7b8e83c6e3be466dc22c3cf8e Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 14:14:50 -0700
Subject: [PATCH 36/64] strong type the Context.diagnostics and requirments
 properties

---
 types/office-js/index.d.ts | 65 +++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 05ffc588a9..9f8ea6d923 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -413,11 +413,11 @@ declare namespace Office {
         */
         auth: Auth;
         /**
-         * True, if the current platform allows the add-in to  display a UI for selling or upgrading; otherwise returns False.
-         * 
-         * @remarks
-         * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on the Windows desktop or for Office Online in the browser, do allow such links. If you want the UI of your add-in to provide a link to an external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.
-         */
+        * True, if the current platform allows the add-in to display a UI for selling or upgrading; otherwise returns False.
+        * 
+        * @remarks
+        * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on the Windows desktop or for Office Online in the browser, do allow such links. If you want the UI of your add-in to provide a link to an external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.
+        */
         commerceAllowed: boolean;
         /**
         * Gets the locale (language) specified by the user for editing the document or item.
@@ -426,20 +426,7 @@ declare namespace Office {
         /**
         * Gets information about the environment in which the add-in is running.
         */
-        diagnostics: {
-            /**
-            * Gets the Office application host in which the add-in is running.
-            */
-            host: HostType;
-            /**
-            * Gets the platform on which the add-in is running.
-            */
-            platform: PlatformType;
-            /**
-            * Gets the version of Office on which the add-in is running.
-            */
-            version: string;
-        };
+        diagnostics: ContextInformation;
         /**
         * Gets the locale (language) specified by the user for the UI of the Office host application.
         * @remarks
@@ -488,14 +475,7 @@ declare namespace Office {
         /**
         * Provides a method for determining what requirement sets are supported on the current host and platform.
         */
-        requirements: {
-            /**
-             * Check if the specified requirement set is supported by the host Office application.
-             * @param name - Set name; e.g., "MatrixBindings".
-             * @param minVersion - The minimum required version; e.g., "1.4".
-             */
-            isSetSupported(name: string, minVersion?: number): boolean;
-        }
+        requirements: RequirmentSetSupport;
         /**
          * Gets an object that represents the custom settings or state of a mail add-in saved to a user's mailbox.
          *
@@ -605,6 +585,17 @@ declare namespace Office {
          */
         closeContainer(): void;
     }
+    /**
+     * Provides information about what Requirement Sets are supported in current environment.
+     */
+    interface RequirmentSetSupport {
+        /**
+        * Check if the specified requirement set is supported by the host Office application.
+        * @param name - Set name; e.g., "MatrixBindings".
+        * @param minVersion - The minimum required version; e.g., "1.4".
+        */
+       isSetSupported(name: string, minVersion?: number): boolean;
+}
     /**
      * Provides options for how a dialog is displayed.
      */
@@ -673,6 +664,23 @@ declare namespace Office {
          */
         asyncContext?: any
     }
+    /**
+     * Provides information about the environment in which the add-in is running.
+     */
+    interface ContextInformation {
+        /**
+        * Gets the Office application host in which the add-in is running.
+        */
+        host: Office.HostType;
+        /**
+        * Gets the platform on which the add-in is running.
+        */
+        platform: Office.PlatformType;
+        /**
+        * Gets the version of Office on which the add-in is running.
+        */
+        version: string;
+    }
     /**
      * Provides options for how to get the data in a binding.
      *
@@ -825,7 +833,7 @@ declare namespace Office {
         /**
          * Specifies a table of sample data displayed in the prompt UI as an example of the kinds of fields (columns) that can be bound by your add-in. The headers provided in the TableData object specify the labels used in the field selection UI. Note: This parameter is used only in add-ins for Access. It is ignored if provided when calling the method in an add-in for Excel.
          */
-        sampleData?: TableData
+        sampleData?: Office.TableData
         /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
@@ -993,7 +1001,6 @@ declare namespace Office {
          * - DialogEventReceived. Triggered when the dialog box has been closed or otherwise unloaded.
          */
         addEventHandler(eventType: Office.EventType, handler: Function): void;
-
     }
 }
 

From 374b6dd963159bef5a5904c3f7a79ad7d156532a Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 19:42:59 +0700
Subject: [PATCH 37/64] Since 4.14.0 options added in reeq.range()

---
 types/express-serve-static-core/index.d.ts | 31 +++++++++++++---------
 types/express/express-tests.ts             |  4 +++
 types/express/index.d.ts                   |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index f8521d433d..f7c081fb74 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Express 4.11
+// Type definitions for Express 4.16
 // Project: http://expressjs.com
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 Michał Lytek <https://github.com/19majkel94>
@@ -23,6 +23,7 @@ declare global {
 
 import * as http from "http";
 import { EventEmitter } from "events";
+import { Options as RangeParserOptions } from "range-parser";
 
 export interface NextFunction {
     // tslint:disable-next-line callable-types (In ts2.1 it thinks the type alias has no call signatures)
@@ -283,21 +284,25 @@ export interface Request extends http.IncomingMessage, Express.Request {
     acceptsLanguages(...lang: string[]): string | false;
 
     /**
-     * Parse Range header field,
-     * capping to the given `size`.
+     * Parse Range header field, capping to the given `size`.
      *
-     * Unspecified ranges such as "0-" require
-     * knowledge of your resource length. In
-     * the case of a byte range this is of course
-     * the total number of bytes. If the Range
-     * header field is not given `null` is returned,
-     * `-1` when unsatisfiable, `-2` when syntactically invalid.
+     * Unspecified ranges such as "0-" require knowledge of your resource length. In
+     * the case of a byte range this is of course the total number of bytes. If the
+     * Range header field is not given `undefined` is returned, `-1` when unsatisfiable,
+     * and `-2` when syntactically invalid.
+     *
+     * When ranges are returned, the array has a "type" property which is the type of
+     * range that is required (most commonly, "bytes"). Each array element is an object
+     * with a "start" and "end" property for the portion of the range.
+     *
+     * The "combine" option can be set to `true` and overlapping & adjacent ranges
+     * will be combined into a single range.
+     *
+     * NOTE: remember that ranges are inclusive, so for example "Range: users=0-3"
+     * should respond with 4 users when available, not 3.
      *
-     * NOTE: remember that ranges are inclusive, so
-     * for example "Range: users=0-3" should respond
-     * with 4 users when available, not 3.
      */
-    range(size: number): RequestRanges|null|-1|-2;
+    range(size: number, options?: RangeParserOptions): RequestRanges|undefined|-1|-2;
 
     /**
      * Return an array of Accepted media types
diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 137c70c8e8..7297692119 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -104,6 +104,9 @@ namespace express_tests {
             req.headers.existingHeader as string;
             req.headers.nonExistingHeader as any as undefined;
 
+            // Since 4.14.0 req.range() has options
+            req.range(2, { combine: true });
+
             res.send(req.query['token']);
         });
 
@@ -139,6 +142,7 @@ namespace express_tests {
  *                         *
  ***************************/
 import * as http from 'http';
+import { RequestRanges } from 'express-serve-static-core';
 
 namespace node_tests {
     {
diff --git a/types/express/index.d.ts b/types/express/index.d.ts
index 4e6ed8fcc1..81821ca98c 100644
--- a/types/express/index.d.ts
+++ b/types/express/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Express 4.11
+// Type definitions for Express 4.16
 // Project: http://expressjs.com
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From afeac2b7eb267f3a84b605edb4e161e7705676b3 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 19:46:45 +0700
Subject: [PATCH 38/64] Fix #24495 missing req.res, req.next and res.req

---
 types/express-serve-static-core/index.d.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index f7c081fb74..f4e4b5379c 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -455,6 +455,13 @@ export interface Request extends http.IncomingMessage, Express.Request {
     baseUrl: string;
 
     app: Application;
+
+    /**
+     * After middleware.init executed, Request will contain res and next properties
+     * See: express/lib/middleware/init.js
+     */
+    res?: Response;
+    next?: NextFunction;
 }
 
 export interface MediaType {
@@ -833,6 +840,12 @@ export interface Response extends http.ServerResponse, Express.Response {
      * @since 4.11.0
      */
     append(field: string, value?: string[]|string): Response;
+
+    /**
+     * After middleware.init executed, Response will contain req property
+     * See: express/lib/middleware/init.js
+     */
+    req?: Request;
 }
 
 export interface Handler extends RequestHandler { }

From e92ce1352a18e455ac309cff775ed5f2e5e6299e Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 19:56:10 +0700
Subject: [PATCH 39/64] Update test cases to test req.res, req.next, res.req

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

diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 7297692119..49d5acfd3c 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -131,6 +131,13 @@ namespace express_tests {
 
     app.use(router);
 
+    // Test req.res, req.next, res.req should exists after middleware.init
+    app.use((req, res) => {
+        req.res;
+        req.next;
+        res.req;
+    });
+
     app.listen(3000);
 
     const next: express.NextFunction = () => { };

From c2d945805a684d67295473791935f8c3b8fee0a8 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 20:13:54 +0700
Subject: [PATCH 40/64] Fix #18940 express app supports on mount event and
 mountpath property

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

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index f4e4b5379c..d1997d3b4b 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -1080,6 +1080,22 @@ export interface Application extends EventEmitter, IRouter, Express.Application
     _router: any;
 
     use: ApplicationRequestHandler<this>;
+
+    /**
+     * The mount event is fired on a sub-app, when it is mounted on a parent app.
+     * The parent app is passed to the callback function.
+     *
+     * NOTE:
+     * Sub-apps will:
+     *  - Not inherit the value of settings that have a default value. You must set the value in the sub-app.
+     *  - Inherit the value of settings with no default value.
+     */
+    on: (eventName: string, callback: (parent: Application) => void) => void;
+
+    /**
+     * The app.mountpath property contains one or more path patterns on which a sub-app was mounted.
+     */
+    mountpath: string|string[];
 }
 
 export interface Express extends Application {
diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 49d5acfd3c..07bf2fc5c3 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -138,6 +138,12 @@ namespace express_tests {
         res.req;
     });
 
+    // Test on mount event
+    app.on('mount', (parent) => true);
+
+    // Test mountpath
+    const mountPath: string|string[] = app.mountpath;
+
     app.listen(3000);
 
     const next: express.NextFunction = () => { };

From ff6fb49f9e3d623d6e1c2848df7f1d48da5524b2 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 20:21:04 +0700
Subject: [PATCH 41/64] Fix #18940 express app supports on mount event and
 mountpath property

---
 types/express-serve-static-core/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index d1997d3b4b..7603445b3b 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -302,7 +302,7 @@ export interface Request extends http.IncomingMessage, Express.Request {
      * should respond with 4 users when available, not 3.
      *
      */
-    range(size: number, options?: RangeParserOptions): RequestRanges|undefined|-1|-2;
+    range(size: number, options?: RangeParserOptions): RequestRanges | undefined | -1 | -2;
 
     /**
      * Return an array of Accepted media types
@@ -839,7 +839,7 @@ export interface Response extends http.ServerResponse, Express.Response {
      *
      * @since 4.11.0
      */
-    append(field: string, value?: string[]|string): Response;
+    append(field: string, value?: string[] | string): Response;
 
     /**
      * After middleware.init executed, Response will contain req property
@@ -1090,12 +1090,12 @@ export interface Application extends EventEmitter, IRouter, Express.Application
      *  - Not inherit the value of settings that have a default value. You must set the value in the sub-app.
      *  - Inherit the value of settings with no default value.
      */
-    on: (eventName: string, callback: (parent: Application) => void) => void;
+    on: (event: string, callback: (parent: Application) => void) => this;
 
     /**
      * The app.mountpath property contains one or more path patterns on which a sub-app was mounted.
      */
-    mountpath: string|string[];
+    mountpath: string | string[];
 }
 
 export interface Express extends Application {

From 8d935f62f677c2d317fae9830349a29614374fea Mon Sep 17 00:00:00 2001
From: Peter Keuter <github@peterkeuter.nl>
Date: Sun, 3 Jun 2018 20:07:50 +0200
Subject: [PATCH 42/64] Remove unnecessary LabelProps reference

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index a2e2024343..cee2cf3f21 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -164,7 +164,7 @@ export interface AreaProps extends EventAttributes, Partial<PresentationAttribut
     connectNulls?: boolean;
     activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
-    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any> | LabelProps['content'];
+    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any>;
     hide?: boolean;
     layout?: LayoutType;
     baseLine?: number | any[];
@@ -405,7 +405,7 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     width?: number;
     height?: number;
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
-    label?: boolean | object | React.ReactElement<any> | ContentRenderer<any> | LabelProps['content'];
+    label?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     points?: Point[];
 }
 
@@ -438,8 +438,8 @@ export interface PieProps extends EventAttributes, Partial<PresentationAttribute
     labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
     label?: {
         offsetRadius: number;
-    } | LabelProps['content'] | React.ReactElement<any> | ContentRenderer<any> | boolean;
-    activeShape?: object |ContentRenderer<any> | React.ReactElement<any>;
+    } | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
     activeIndex?: number | number[];
 }
 
@@ -553,7 +553,7 @@ export interface RadarProps extends EventAttributes, Partial<PresentationAttribu
     shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
     activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
     dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
-    label?: object | React.ReactElement<any> | ContentRenderer<any> | LabelProps['content'] | boolean;
+    label?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
     legendType?: LegendType;
     hide?: boolean;
 }
@@ -592,7 +592,7 @@ export interface RadialBarProps extends EventAttributes, Partial<PresentationAtt
     maxBarSize?: number;
     data?: RadialBarData[];
     legendType?: LegendType;
-    label?: boolean | React.ReactElement<any> | LabelProps['content'] | object;
+    label?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
     background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
     hide?: boolean;
 }
@@ -839,7 +839,7 @@ export interface LabelProps {
     position?: PositionType;
     children?: React.ReactNode[] | React.ReactNode;
     className?: string;
-    content?: React.ReactElement<any> | ContentRenderer<Label>;
+    content?: React.ReactElement<any> | ContentRenderer<any>;
 }
 
 export type AxisDomain = string | number | ContentRenderer<any> | 'auto' | 'dataMin' | 'dataMax';

From 7cb2ad51dd22f7ef7f0848faa6b85e0da1c804cb Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sun, 3 Jun 2018 15:14:13 -0400
Subject: [PATCH 43/64] Types for JQuery Mouse Exit

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

diff --git a/types/jquery-mouse-exit/index.d.ts b/types/jquery-mouse-exit/index.d.ts
new file mode 100644
index 0000000000..f0ba17996e
--- /dev/null
+++ b/types/jquery-mouse-exit/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for jquery-mouse-exit 1.0
+// Project: https://github.com/makeup-jquery/jquery-mouse-exit
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export type Options = Partial<{
+    delay: number;
+}>;
+
+export type FocusElements = Partial<{
+    lostFocus: HTMLElement;
+    gainedFocus: HTMLElement;
+}>;
+
+declare global {
+    interface JQuery {
+        mouseExit(options?: Options): JQuery;
+        on(event: 'mouseExit', handler: ((event: JQuery.Event<HTMLElement>, data: FocusElements) => void)): JQuery;
+    }
+}
diff --git a/types/jquery-mouse-exit/jquery-mouse-exit-tests.ts b/types/jquery-mouse-exit/jquery-mouse-exit-tests.ts
new file mode 100644
index 0000000000..7ae495ee1b
--- /dev/null
+++ b/types/jquery-mouse-exit/jquery-mouse-exit-tests.ts
@@ -0,0 +1,9 @@
+// init plugin
+$('#container').mouseExit({
+  delay: 500
+});
+
+// handle event
+$('#container').on('mouseExit', (e, data) => {
+  console.log(data.lostFocus, data.gainedFocus);
+});
diff --git a/types/jquery-mouse-exit/tsconfig.json b/types/jquery-mouse-exit/tsconfig.json
new file mode 100644
index 0000000000..a9bc588d0d
--- /dev/null
+++ b/types/jquery-mouse-exit/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-mouse-exit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-mouse-exit/tslint.json b/types/jquery-mouse-exit/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-mouse-exit/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 13cf35e543dd7454c2a1f1bae20de0c0ad9d13fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20Damgaard=20M=C3=B8ller?= <jakob@devinci.dk>
Date: Sun, 3 Jun 2018 21:41:48 +0200
Subject: [PATCH 44/64] Tests added to cover ValueFOrmat(d3.format("..."))

---
 types/nvd3/test/discreteBarChart.ts        | 1 +
 types/nvd3/test/multibarHorizontalChart.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/nvd3/test/discreteBarChart.ts b/types/nvd3/test/discreteBarChart.ts
index 2f31a29a0c..d9c8998fb1 100644
--- a/types/nvd3/test/discreteBarChart.ts
+++ b/types/nvd3/test/discreteBarChart.ts
@@ -48,6 +48,7 @@ namespace nvd3_test_discreteBarChart {
             //.staggerLabels(historicalBarChart[0].values.length > 8)
             .showValues(true)
             .duration(250)
+            .valueFormat(d3.format("d"))
             ;
 
         d3.select('#chart1 svg')
diff --git a/types/nvd3/test/multibarHorizontalChart.ts b/types/nvd3/test/multibarHorizontalChart.ts
index 748c83e10a..5bfc5d976f 100644
--- a/types/nvd3/test/multibarHorizontalChart.ts
+++ b/types/nvd3/test/multibarHorizontalChart.ts
@@ -136,6 +136,7 @@ namespace nvd3_test_multibarHorizontalChart {
             .barColor(d3.scale.category20().range())
             .duration(250)
             .margin({ left: 100 })
+            .valueFormat(d3.format("d"))
             .stacked(true);
 
         chart.yAxis.tickFormat(d3.format(',.2f'));

From b956900bc1554ef5b638257675e8bf4cd97d491c Mon Sep 17 00:00:00 2001
From: miZyind <mizyind@gmail.com>
Date: Mon, 4 Jun 2018 04:07:32 +0800
Subject: [PATCH 45/64] Upgrade to v5.x

---
 types/koa-webpack/index.d.ts           | 21 +++++---
 types/koa-webpack/koa-webpack-tests.ts | 69 +++++++++++++++-----------
 2 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/types/koa-webpack/index.d.ts b/types/koa-webpack/index.d.ts
index 4f86fcd11f..951d8d58a2 100644
--- a/types/koa-webpack/index.d.ts
+++ b/types/koa-webpack/index.d.ts
@@ -1,30 +1,35 @@
-// Type definitions for koa-webpack 1.0
+// Type definitions for koa-webpack 5.x
 // Project: https://github.com/shellscape/koa-webpack#readme
 // Definitions by: Luka Maljic <https://github.com/malj>
+//                 Lee Benson <https://github.com/leebenson>
+//                 miZyind <https://github.com/miZyind>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import Koa = require('koa');
 import webpack = require('webpack');
 import webpackDevMiddleware = require('webpack-dev-middleware');
-import webpackHotMiddleware = require('webpack-hot-middleware');
-import connect = require('connect');
+import webpackHotClient = require('webpack-hot-client');
 
 declare function koaWebpack(
     options?: koaWebpack.Options
-): Koa.Middleware & koaWebpack.CombinedWebpackMiddleware;
+): Promise<Koa.Middleware & koaWebpack.CombinedWebpackMiddleware>;
 
 declare namespace koaWebpack {
     interface Options {
         compiler?: webpack.Compiler;
         config?: webpack.Configuration;
-        dev?: webpackDevMiddleware.Options;
-        hot?: webpackHotMiddleware.Options | boolean;
+        devMiddleware?: webpackDevMiddleware.Options;
+        hotClient?: webpackHotClient.Options | boolean;
     }
 
     interface CombinedWebpackMiddleware {
-        dev: connect.NextHandleFunction & webpackDevMiddleware.WebpackDevMiddleware;
-        hot: connect.NextHandleFunction & webpackHotMiddleware.EventStream;
+        devMiddleware: webpackDevMiddleware.WebpackDevMiddleware;
+        hotClient: {
+            close: () => void;
+            options: webpackHotClient.Options;
+            server: any;
+        };
     }
 }
 
diff --git a/types/koa-webpack/koa-webpack-tests.ts b/types/koa-webpack/koa-webpack-tests.ts
index 12062302de..de4990eea6 100644
--- a/types/koa-webpack/koa-webpack-tests.ts
+++ b/types/koa-webpack/koa-webpack-tests.ts
@@ -7,39 +7,50 @@ const config: webpack.Configuration = {};
 const compiler = webpack(config);
 
 // Using the middleware
-
-const middleware = koaWebpack({
+koaWebpack({
     compiler,
     config,
-    dev: {
-        lazy: true,
-        watchOptions: {
-            aggregateTimeout: 300,
-            poll: true,
-        },
-        publicPath: '/assets/',
+    // Reference: https://github.com/webpack/webpack-dev-middleware#options
+    devMiddleware: {
+        headers: { 'X-Custom-Header': 'yes' },
         index: 'index.html',
-        headers: {
-            'X-Custom-Header': 'yes'
-        },
-        stats: {
-            colors: true,
-        },
+        lazy: false,
+        logger: undefined,
+        logLevel: 'info',
+        // logTime: false,
+        // mimeTypes: null,
+        publicPath: '/assets/',
         reporter: null,
-        serverSideRender: false
+        serverSideRender: false,
+        stats: { context: process.cwd() },
+        watchOptions: { aggregateTimeout: 200 },
+        // writeToDisk: false
     },
-    hot: {
-        log: console.log.bind(console),
-        path: '/__what',
-        heartbeat: 2000
+    // Reference: https://github.com/webpack-contrib/webpack-hot-client#api
+    hotClient: {
+        allEntries: false,
+        autoConfigure: true,
+        host: 'localhost',
+        hmr: true,
+        https: false,
+        logLevel: 'info',
+        logTime: false,
+        port: 0,
+        reload: true,
+        server: undefined,
+        stats: { context: process.cwd() }
     }
-});
+})
+    .then((middleware) => {
+        app.use(middleware);
 
-app.use(middleware);
-
-// Accessing the underlying middleware
-
-middleware.dev.close();
-middleware.dev.invalidate();
-middleware.dev.waitUntilValid();
-middleware.hot.publish(null);
+        // Accessing the underlying middleware
+        middleware.devMiddleware.close();
+        middleware.devMiddleware.invalidate();
+        middleware.devMiddleware.waitUntilValid();
+        middleware.devMiddleware.getFilenameFromUrl('/public/index.html');
+        middleware.devMiddleware.fileSystem;
+        middleware.hotClient.close();
+        middleware.hotClient.options;
+        middleware.hotClient.server;
+    });

From 9cc10b303cc710b95b15fa608d84c447051c26a8 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Mon, 4 Jun 2018 11:57:15 +0700
Subject: [PATCH 46/64] Fixed bug in [@types/kraken-js] should not extends
 EventEmitter by itself as it is extended via Express Application

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

diff --git a/types/kraken-js/index.d.ts b/types/kraken-js/index.d.ts
index 0980e31eb1..c7aabc216b 100644
--- a/types/kraken-js/index.d.ts
+++ b/types/kraken-js/index.d.ts
@@ -5,12 +5,11 @@
 // TypeScript Version: 2.2
 
 import { Express } from 'express';
-import { EventEmitter } from 'events';
 
 declare function k(options?: k.Options | string): Express;
 
 declare namespace k {
-    interface Kraken extends Express, EventEmitter {
+    interface Kraken extends Express {
         kraken: Kraken;
     }
 

From 7c501b22e6e258f570d0eccdfbaa792653dd782d Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Mon, 4 Jun 2018 12:02:53 +0700
Subject: [PATCH 47/64] Add a contributor

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

diff --git a/types/kraken-js/index.d.ts b/types/kraken-js/index.d.ts
index c7aabc216b..3013938dd2 100644
--- a/types/kraken-js/index.d.ts
+++ b/types/kraken-js/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for krakenjs 2.2
 // Project: http://krakenjs.com
 // Definitions by: Timur Manyanov <https://github.com/darkwebdev>
+//                 Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From 5fbc378a2fcb0c591091c857695e8b3314da4735 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Mon, 4 Jun 2018 15:04:46 +0700
Subject: [PATCH 48/64] Move partial of req.range documents to range-parser

---
 types/express-serve-static-core/index.d.ts | 20 +++++++-------------
 types/range-parser/index.d.ts              | 11 +++++++++++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index 7603445b3b..96c4c233c2 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -23,7 +23,7 @@ declare global {
 
 import * as http from "http";
 import { EventEmitter } from "events";
-import { Options as RangeParserOptions } from "range-parser";
+import { Options as RangeParserOptions, Result as RangeParserResult, Ranges as RangeParserRanges } from "range-parser";
 
 export interface NextFunction {
     // tslint:disable-next-line callable-types (In ts2.1 it thinks the type alias has no call signatures)
@@ -175,7 +175,7 @@ export interface CookieOptions {
 
 export interface ByteRange { start: number; end: number; }
 
-export interface RequestRanges extends Array<ByteRange> { type: string; }
+export interface RequestRanges extends RangeParserRanges { }
 
 export type Errback = (err: Error) => void;
 
@@ -287,22 +287,16 @@ export interface Request extends http.IncomingMessage, Express.Request {
      * Parse Range header field, capping to the given `size`.
      *
      * Unspecified ranges such as "0-" require knowledge of your resource length. In
-     * the case of a byte range this is of course the total number of bytes. If the
-     * Range header field is not given `undefined` is returned, `-1` when unsatisfiable,
-     * and `-2` when syntactically invalid.
-     *
-     * When ranges are returned, the array has a "type" property which is the type of
-     * range that is required (most commonly, "bytes"). Each array element is an object
-     * with a "start" and "end" property for the portion of the range.
-     *
-     * The "combine" option can be set to `true` and overlapping & adjacent ranges
-     * will be combined into a single range.
+     * the case of a byte range this is of course the total number of bytes.
+     * If the Range header field is not given `undefined` is returned.
+     * If the Range header field is given, return value is a result of range-parser.
+     * See more ./types/range-parser/index.d.ts
      *
      * NOTE: remember that ranges are inclusive, so for example "Range: users=0-3"
      * should respond with 4 users when available, not 3.
      *
      */
-    range(size: number, options?: RangeParserOptions): RequestRanges | undefined | -1 | -2;
+    range(size: number, options?: RangeParserOptions): RangeParserRanges | RangeParserResult | undefined;
 
     /**
      * Return an array of Accepted media types
diff --git a/types/range-parser/index.d.ts b/types/range-parser/index.d.ts
index 5912777ec0..a1bcf4c9dc 100644
--- a/types/range-parser/index.d.ts
+++ b/types/range-parser/index.d.ts
@@ -3,6 +3,13 @@
 // Definitions by: Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/**
+ * Returns `-1` when unsatisfiable and `-2` when syntactically invalid.
+ *
+ * When ranges are returned, the array has a "type" property which is the type of
+ * range that is required (most commonly, "bytes"). Each array element is an object
+ * with a "start" and "end" property for the portion of the range.
+ */
 declare function RangeParser(size: number, str: string, options?: RangeParser.Options): RangeParser.Result | RangeParser.Ranges;
 
 declare namespace RangeParser {
@@ -14,6 +21,10 @@ declare namespace RangeParser {
         end: number;
     }
     interface Options {
+        /**
+         * The "combine" option can be set to `true` and overlapping & adjacent ranges
+         * will be combined into a single range.
+         */
         combine?: boolean;
     }
     const enum Result {

From b799d29dff1f761436e006c109933b7e86e6faac Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 05:02:16 -0400
Subject: [PATCH 49/64] (react-native-tab-view) Update types for 1.0

---
 types/react-native-tab-view/index.d.ts        | 344 +++++++++---------
 .../react-native-tab-view-tests.tsx           |  87 ++---
 2 files changed, 213 insertions(+), 218 deletions(-)

diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
index 2c6546a628..a5a62f8270 100644
--- a/types/react-native-tab-view/index.d.ts
+++ b/types/react-native-tab-view/index.d.ts
@@ -1,237 +1,231 @@
-// Type definitions for react-native-tab-view 0.0
+// Type definitions for react-native-tab-view 1.0
 // Project: https://github.com/react-native-community/react-native-tab-view
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
+//                 Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-import { PureComponent, ReactNode, ComponentType } from 'react'
-import {
-  Animated,
-  StyleProp,
-  ViewStyle,
-  EasingFunction
-} from 'react-native'
+import { PureComponent, ReactNode, ComponentType } from 'react';
+import { Animated, StyleProp, ViewStyle, EasingFunction } from 'react-native';
 
-export type Key = { key: string }
-export type RouteBase = Key & { testID?: string }
+export type Key = { key: string };
+export type RouteBase = Key & { testID?: string };
 
-export type Route<T extends RouteBase = RouteBase> = T
+export type Route<T extends RouteBase = RouteBase> = T;
 
 export type NavigationState<T extends Key> = {
-  index: number
-  routes: T[]
-}
+    index: number;
+    routes: T[];
+};
 
 export type Scene<T> = {
-  route: T
-  focused: boolean
-  index: number
-}
+    route: T;
+    focused: boolean;
+    index: number;
+};
 
 export type Layout = {
-  height: number
-  width: number
-}
+    height: number;
+    width: number;
+};
 
 export type SceneRendererProps<T extends RouteBase = RouteBase> = {
-  layout: Layout & {
-    measured: boolean
-  }
-  navigationState: NavigationState<T>
-  position: Animated.Value
-  jumpToIndex: (index: number) => void
-  getLastPosition: () => number
-  subscribe: (
-    event: SubscriptionName,
-    callback: () => void
-  ) => { remove: () => void }
-}
+    layout: Layout & {
+        measured: boolean;
+    };
+    navigationState: NavigationState<T>;
+    position: Animated.Value;
+    jumpTo: (key: string) => void;
+    getLastPosition: () => number;
+    subscribe: (
+        event: SubscriptionName,
+        callback: () => void
+    ) => { remove: () => void };
+};
 
-export type SubscriptionName = 'reset' | 'position'
+export type SubscriptionName = 'reset' | 'position';
 
 export type TransitionProps = {
-  progress: number
-}
+    progress: number;
+};
 
 export type NavigationTransitionSpec = {
-  duration?: number,
-  // An easing function from `Easing`.
-  easing?: EasingFunction,
-  // A timing function such as `Animated.timing`.
-  timing?: (value: Animated.Value, config: any) => any,
-}
+    duration?: number;
+    // An easing function from `Easing`.
+    easing?: EasingFunction;
+    // A timing function such as `Animated.timing`.
+    timing?: (value: Animated.Value, config: any) => any;
+};
 
 export type TransitionConfigurator = (
-  currentTransitionProps: TransitionProps,
-  nextTransitionProps: TransitionProps
-) => NavigationTransitionSpec
+    currentTransitionProps: TransitionProps,
+    nextTransitionProps: TransitionProps
+) => NavigationTransitionSpec;
 
 export type PagerProps = {
-  configureTransition?: TransitionConfigurator
-  animationEnabled?: boolean
-  swipeEnabled?: boolean
-  swipeDistanceThreshold?: number
-  swipeVelocityThreshold?: number
-  children?: ReactNode
-}
+    configureTransition?: TransitionConfigurator;
+    animationEnabled?: boolean;
+    swipeEnabled?: boolean;
+    swipeDistanceThreshold?: number;
+    swipeVelocityThreshold?: number;
+    children?: ReactNode;
+};
 
-export type TabViewAnimatedProps<
-  T extends RouteBase = RouteBase
-> = PagerProps & {
-  navigationState: NavigationState<T>
-  onIndexChange: (index: number) => void
-  onPositionChange?: (props: { value: number }) => void
-  initialLayout?: Layout
-  canJumpToTab?: (route: T) => boolean
-  renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode
-  renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode
-  renderHeader?: (props: SceneRendererProps<T>) => ReactNode
-  renderFooter?: (props: SceneRendererProps<T>) => ReactNode
-  lazy?: boolean
-  style?: StyleProp<ViewStyle>
-}
+export type TabViewProps<T extends RouteBase = RouteBase> = PagerProps & {
+    navigationState: NavigationState<T>;
+    tabBarPosition?: 'bottom' | 'top';
+    onIndexChange: (index: number) => void;
+    onPositionChange?: (props: { value: number }) => void;
+    initialLayout?: Layout;
+    canJumpToTab?: (route: T) => boolean;
+    renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode;
+    renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode;
+    renderTabBar?: (props: SceneRendererProps<T>) => ReactNode;
+    lazy?: boolean;
+    style?: StyleProp<ViewStyle>;
+};
 
-export class TabViewAnimated<T extends Route = Route> extends PureComponent<
-  TabViewAnimatedProps<T>,
-  any
+export class TabView<T extends Route = Route> extends PureComponent<
+    TabViewProps<T>,
+    any
 > {}
 
 export type GestureEvent = {
-  nativeEvent: {
-    changedTouches: any[]
-    identifier: number
-    locationX: number
-    locationY: number
-    pageX: number
-    pageY: number
-    target: number
-    timestamp: number
-    touches: any[]
-  }
-}
+    nativeEvent: {
+        changedTouches: any[];
+        identifier: number;
+        locationX: number;
+        locationY: number;
+        pageX: number;
+        pageY: number;
+        target: number;
+        timestamp: number;
+        touches: any[];
+    };
+};
 
 export type GestureState = {
-  stateID: number
-  moveX: number
-  moveY: number
-  x0: number
-  y0: number
-  dx: number
-  dy: number
-  vx: number
-  vy: number
-  numberActiveTouches: number
-}
+    stateID: number;
+    moveX: number;
+    moveY: number;
+    x0: number;
+    y0: number;
+    dx: number;
+    dy: number;
+    vx: number;
+    vy: number;
+    numberActiveTouches: number;
+};
 
-export type GestureHandler = (event: GestureEvent, state: GestureState) => void
+export type GestureHandler = (event: GestureEvent, state: GestureState) => void;
 
-export type TabViewPagerPanProps<
-  T extends RouteBase = RouteBase
-> = SceneRendererProps<T> & {
-  configureTransition?: TransitionConfigurator
-  animationEnabled?: boolean
-  swipeEnabled?: boolean
-  swipeDistanceThreshold?: number
-  swipeVelocityThreshold?: number
-  onSwipeStart?: GestureHandler
-  onSwipeEnd?: GestureHandler
-  children?: ReactNode
-}
+export type PagerPanProps<T extends RouteBase = RouteBase> = SceneRendererProps<
+    T
+> & {
+    configureTransition?: TransitionConfigurator;
+    animationEnabled?: boolean;
+    swipeEnabled?: boolean;
+    swipeDistanceThreshold?: number;
+    swipeVelocityThreshold?: number;
+    onSwipeStart?: GestureHandler;
+    onSwipeEnd?: GestureHandler;
+    children?: ReactNode;
+};
 
 export type DefaultTransitionSpec = {
-  timing: typeof Animated.spring
-  tension: 300
-  friction: 35
-}
+    timing: typeof Animated.spring;
+    tension: 300;
+    friction: 35;
+};
 
-export class TabViewPagerPan<T extends Route = Route> extends PureComponent<
-  TabViewPagerPanProps<T>,
-  void
+export class PagerPan<T extends Route = Route> extends PureComponent<
+    PagerPanProps<T>,
+    void
 > {
-  static defaultProps: {
-    configureTransition: () => DefaultTransitionSpec
-    initialLayout: {
-      height: 0
-      width: 0
-    }
-    swipeDistanceThreshold: 120
-    swipeVelocityThreshold: 0.25
-  }
+    static defaultProps: {
+        configureTransition: () => DefaultTransitionSpec;
+        initialLayout: {
+            height: 0;
+            width: 0;
+        };
+        swipeDistanceThreshold: 120;
+        swipeVelocityThreshold: 0.25;
+    };
 }
 
 export type ScrollEvent = {
-  nativeEvent: {
-    contentOffset: {
-      x: number
-      y: number
-    }
-  }
-}
+    nativeEvent: {
+        contentOffset: {
+            x: number;
+            y: number;
+        };
+    };
+};
 
-export type TabViewPagerScrollProps<
-  T extends RouteBase = RouteBase
+export type PagerScrollProps<
+    T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-  animationEnabled?: boolean
-  swipeEnabled?: boolean
-  children?: ReactNode
-}
+    animationEnabled?: boolean;
+    swipeEnabled?: boolean;
+    children?: ReactNode;
+};
 
-export class TabViewPagerScroll<T extends Route = Route> extends PureComponent<
-  TabViewPagerScrollProps<T>,
-  any
+export class PagerScroll<T extends Route = Route> extends PureComponent<
+    PagerScrollProps<T>,
+    any
 > {}
 
 export type PageScrollEvent = {
-  nativeEvent: {
-    position: number
-    offset: number
-  }
-}
+    nativeEvent: {
+        position: number;
+        offset: number;
+    };
+};
 
-export type PageScrollState = 'dragging' | 'settling' | 'idle'
+export type PageScrollState = 'dragging' | 'settling' | 'idle';
 
-export type TabViewPagerAndroidProps<
-  T extends RouteBase = RouteBase
+export type PagerAndroidProps<
+    T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-  animationEnabled?: boolean
-  swipeEnabled?: boolean
-  children?: ReactNode
-}
+    animationEnabled?: boolean;
+    swipeEnabled?: boolean;
+    children?: ReactNode;
+};
 
-export class TabViewPagerAndroid<T extends Route = Route> extends PureComponent<
-  TabViewPagerAndroidProps<T>,
-  void
+export class PagerAndroid<T extends Route = Route> extends PureComponent<
+    PagerAndroidProps<T>,
+    void
 > {}
 
 export type IndicatorProps<
-  T extends RouteBase = RouteBase
+    T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-  width: Animated.Value
-}
+    width: Animated.Value;
+};
 
 export type TabBarProps<T extends RouteBase = RouteBase> = SceneRendererProps<
-  T
+    T
 > & {
-  scrollEnabled?: boolean
-  pressColor?: string
-  pressOpacity?: number
-  getLabelText?: (scene: Scene<T>) => string | undefined | null
-  renderLabel?: (scene: Scene<T>) => ReactNode
-  renderIcon?: (scene: Scene<T>) => ReactNode
-  renderBadge?: (scene: Scene<T>) => ReactNode
-  renderIndicator?: (props: IndicatorProps<T>) => ReactNode
-  onTabPress?: (scene: Scene<T>) => void
-  tabStyle?: StyleProp<ViewStyle>
-  indicatorStyle?: StyleProp<ViewStyle>
-  labelStyle?: StyleProp<ViewStyle>
-  style?: StyleProp<ViewStyle>
-}
+    scrollEnabled?: boolean;
+    pressColor?: string;
+    pressOpacity?: number;
+    getLabelText?: (scene: Scene<T>) => string | undefined | null;
+    renderLabel?: (scene: Scene<T>) => ReactNode;
+    renderIcon?: (scene: Scene<T>) => ReactNode;
+    renderBadge?: (scene: Scene<T>) => ReactNode;
+    renderIndicator?: (props: IndicatorProps<T>) => ReactNode;
+    onTabPress?: (scene: Scene<T>) => void;
+    tabStyle?: StyleProp<ViewStyle>;
+    indicatorStyle?: StyleProp<ViewStyle>;
+    labelStyle?: StyleProp<ViewStyle>;
+    style?: StyleProp<ViewStyle>;
+};
 
 export class TabBar<T extends Route = Route> extends PureComponent<
-  TabBarProps<T>,
-  any
+    TabBarProps<T>,
+    any
 > {}
 
 export function SceneMap(scenes: {
-  [key: string]: ComponentType<any>
-}): (props: { route: Route }) => ReactNode
+    [key: string]: ComponentType<any>;
+}): (props: { route: Route }) => ReactNode;
diff --git a/types/react-native-tab-view/react-native-tab-view-tests.tsx b/types/react-native-tab-view/react-native-tab-view-tests.tsx
index 97d8c09257..a3e53558ae 100644
--- a/types/react-native-tab-view/react-native-tab-view-tests.tsx
+++ b/types/react-native-tab-view/react-native-tab-view-tests.tsx
@@ -1,58 +1,59 @@
-import { PureComponent, Component } from 'react'
-import { View, StyleSheet } from 'react-native'
+import { PureComponent, Component } from 'react';
+import { View, StyleSheet } from 'react-native';
 import {
-  TabViewAnimated,
-  TabBar,
-  SceneMap,
-  TabBarProps,
-  RouteBase,
-} from 'react-native-tab-view'
+    TabView,
+    TabBar,
+    SceneMap,
+    TabBarProps,
+    RouteBase
+} from 'react-native-tab-view';
 
 const FirstRoute = () => (
-  <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
-)
+    <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
+);
 
 class SecondRoute extends Component {
-  render() {
-    return (
-      <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
-    );
-  }
+    render() {
+        return (
+            <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
+        );
+    }
 }
 
 class TabViewExample extends PureComponent {
-  state: { index: number; routes: Array<RouteBase & { title: string }> } = {
-    index: 0,
-    routes: [
-      { key: 'first', title: 'First' },
-      { key: 'second', title: 'Second' },
-    ],
-  }
+    state: { index: number; routes: Array<RouteBase & { title: string }> } = {
+        index: 0,
+        routes: [
+            { key: 'first', title: 'First' },
+            { key: 'second', title: 'Second' }
+        ]
+    };
 
-  _handleIndexChange = (index: number) => this.setState({ index })
+    _handleIndexChange = (index: number) => this.setState({ index });
 
-  _renderHeader = (props: TabBarProps) => <TabBar {...props} />
+    _renderTabBar = (props: TabBarProps) => <TabBar {...props} />;
 
-  _renderScene = SceneMap({
-    first: FirstRoute,
-    second: SecondRoute,
-  })
+    _renderScene = SceneMap({
+        first: FirstRoute,
+        second: SecondRoute
+    });
 
-  render() {
-    return (
-      <TabViewAnimated
-        style={styles.container}
-        navigationState={this.state}
-        renderScene={this._renderScene}
-        renderHeader={this._renderHeader}
-        onIndexChange={this._handleIndexChange}
-      />
-    )
-  }
+    render() {
+        return (
+            <TabView
+                style={styles.container}
+                navigationState={this.state}
+                renderScene={this._renderScene}
+                renderTabBar={this._renderTabBar}
+                tabBarPosition="top"
+                onIndexChange={this._handleIndexChange}
+            />
+        );
+    }
 }
 
 const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
-})
+    container: {
+        flex: 1
+    }
+});

From b3228e51ad092d0f4adad983f0dd1002379edf39 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 05:10:57 -0400
Subject: [PATCH 50/64] Remove import from react-router-navigation

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

diff --git a/types/react-router-navigation/index.d.ts b/types/react-router-navigation/index.d.ts
index 120ffb0d82..0d74da3084 100644
--- a/types/react-router-navigation/index.d.ts
+++ b/types/react-router-navigation/index.d.ts
@@ -4,14 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Component, ReactNode, ReactElement, ComponentClass } from "react";
-import { StyleProp, ViewProps, ViewStyle, TextStyle } from "react-native";
-import { TabViewAnimated, TabViewPagerPan } from "react-native-tab-view";
-import { RouteProps } from "react-router-navigation-core";
+import { Component, ReactNode, ReactElement, ComponentClass } from 'react';
+import { StyleProp, ViewProps, ViewStyle, TextStyle } from 'react-native';
+import { RouteProps } from 'react-router-navigation-core';
 import {
     NavigationTransitionProps,
     NavigationTransitionSpec
-} from "react-navigation";
+} from 'react-navigation';
 
 /**
  * Navigation
@@ -80,7 +79,7 @@ export interface TabBarProps {
     // <BottomNavigation /> only:
     renderTabIcon?: (props: TabSubViewProps) => ReactNode;
     // <Tabs /> only:
-    tabBarPosition?: "top" | "bottom";
+    tabBarPosition?: 'top' | 'bottom';
     tabBarIndicatorStyle?: StyleProp<ViewStyle>;
 }
 

From 479df0e843349248397a3191ea9cfba9dd40515b Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 05:12:28 -0400
Subject: [PATCH 51/64] Update import to TabView

---
 .../react-router-navigation-core-tests.tsx        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/types/react-router-navigation-core/react-router-navigation-core-tests.tsx b/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
index 6d6d048886..08b63cd700 100644
--- a/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
+++ b/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
@@ -1,8 +1,8 @@
-import * as React from "react";
-import { View } from "react-native";
-import { TabStack, renderSubView } from "react-router-navigation-core";
-import { TabBarProps, TabProps } from "react-router-navigation";
-import { TabViewAnimated } from "react-native-tab-view";
+import * as React from 'react';
+import { View } from 'react-native';
+import { TabStack, renderSubView } from 'react-router-navigation-core';
+import { TabBarProps, TabProps } from 'react-router-navigation';
+import { TabView } from 'react-native-tab-view';
 
 type Props = TabBarProps & {
     children?: Array<React.ReactElement<TabProps>>;
@@ -24,7 +24,7 @@ class BottomNavigation extends React.Component<Props, State> {
                 render={props => {
                     const ownProps = { ...this.props, ...props };
                     return (
-                        <TabViewAnimated
+                        <TabView
                             {...props}
                             key={`transitioner_${this.state.key}`}
                             animationEnabled={false}
@@ -32,10 +32,11 @@ class BottomNavigation extends React.Component<Props, State> {
                                 sceneProps => <View />,
                                 ownProps
                             )}
-                            renderFooter={renderSubView(
+                            renderTabBar={renderSubView(
                                 sceneProps => <View />,
                                 ownProps
                             )}
+                            tabBarPosition="bottom"
                             renderScene={renderSubView(
                                 sceneProps => <View />,
                                 ownProps

From d3996bfe20efd23a70ba38bb720a7800c7e2c825 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 05:35:06 -0400
Subject: [PATCH 52/64] Remove prettier spacing changes

---
 types/react-native-tab-view/index.d.ts        | 330 +++++++++---------
 .../react-native-tab-view-tests.tsx           |  88 ++---
 .../react-router-navigation-core-tests.tsx    |  10 +-
 types/react-router-navigation/index.d.ts      |  10 +-
 4 files changed, 222 insertions(+), 216 deletions(-)

diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
index a5a62f8270..c761d80d14 100644
--- a/types/react-native-tab-view/index.d.ts
+++ b/types/react-native-tab-view/index.d.ts
@@ -4,228 +4,234 @@
 //                 Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
+import { PureComponent, ReactNode, ComponentType } from 'react'
+import {
+  Animated,
+  StyleProp,
+  ViewStyle,
+  EasingFunction
+} from 'react-native'
 
-import { PureComponent, ReactNode, ComponentType } from 'react';
-import { Animated, StyleProp, ViewStyle, EasingFunction } from 'react-native';
+export type Key = { key: string }
+export type RouteBase = Key & { testID?: string }
 
-export type Key = { key: string };
-export type RouteBase = Key & { testID?: string };
-
-export type Route<T extends RouteBase = RouteBase> = T;
+export type Route<T extends RouteBase = RouteBase> = T
 
 export type NavigationState<T extends Key> = {
-    index: number;
-    routes: T[];
-};
+  index: number
+  routes: T[]
+}
 
 export type Scene<T> = {
-    route: T;
-    focused: boolean;
-    index: number;
-};
+  route: T
+  focused: boolean
+  index: number
+}
 
 export type Layout = {
-    height: number;
-    width: number;
-};
+  height: number
+  width: number
+}
 
 export type SceneRendererProps<T extends RouteBase = RouteBase> = {
-    layout: Layout & {
-        measured: boolean;
-    };
-    navigationState: NavigationState<T>;
-    position: Animated.Value;
-    jumpTo: (key: string) => void;
-    getLastPosition: () => number;
-    subscribe: (
-        event: SubscriptionName,
-        callback: () => void
-    ) => { remove: () => void };
-};
+  layout: Layout & {
+    measured: boolean
+  }
+  navigationState: NavigationState<T>
+  position: Animated.Value
+  jumpTo: (key: string) => void
+  getLastPosition: () => number
+  subscribe: (
+    event: SubscriptionName,
+    callback: () => void
+  ) => { remove: () => void }
+}
 
-export type SubscriptionName = 'reset' | 'position';
+export type SubscriptionName = 'reset' | 'position'
 
 export type TransitionProps = {
-    progress: number;
-};
+  progress: number
+}
 
 export type NavigationTransitionSpec = {
-    duration?: number;
-    // An easing function from `Easing`.
-    easing?: EasingFunction;
-    // A timing function such as `Animated.timing`.
-    timing?: (value: Animated.Value, config: any) => any;
-};
+  duration?: number,
+  // An easing function from `Easing`.
+  easing?: EasingFunction,
+  // A timing function such as `Animated.timing`.
+  timing?: (value: Animated.Value, config: any) => any,
+}
 
 export type TransitionConfigurator = (
-    currentTransitionProps: TransitionProps,
-    nextTransitionProps: TransitionProps
-) => NavigationTransitionSpec;
+  currentTransitionProps: TransitionProps,
+  nextTransitionProps: TransitionProps
+) => NavigationTransitionSpec
 
 export type PagerProps = {
-    configureTransition?: TransitionConfigurator;
-    animationEnabled?: boolean;
-    swipeEnabled?: boolean;
-    swipeDistanceThreshold?: number;
-    swipeVelocityThreshold?: number;
-    children?: ReactNode;
-};
+  configureTransition?: TransitionConfigurator
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  swipeDistanceThreshold?: number
+  swipeVelocityThreshold?: number
+  children?: ReactNode
+}
 
-export type TabViewProps<T extends RouteBase = RouteBase> = PagerProps & {
-    navigationState: NavigationState<T>;
-    tabBarPosition?: 'bottom' | 'top';
-    onIndexChange: (index: number) => void;
-    onPositionChange?: (props: { value: number }) => void;
-    initialLayout?: Layout;
-    canJumpToTab?: (route: T) => boolean;
-    renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode;
-    renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode;
-    renderTabBar?: (props: SceneRendererProps<T>) => ReactNode;
-    lazy?: boolean;
-    style?: StyleProp<ViewStyle>;
-};
+export type TabViewProps<
+  T extends RouteBase = RouteBase
+> = PagerProps & {
+  navigationState: NavigationState<T>
+  tabBarPosition?: 'bottom' | 'top'
+  onIndexChange: (index: number) => void
+  onPositionChange?: (props: { value: number }) => void
+  initialLayout?: Layout
+  canJumpToTab?: (route: T) => boolean
+  renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode
+  renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode
+  renderTabBar?: (props: SceneRendererProps<T>) => ReactNode
+  lazy?: boolean
+  style?: StyleProp<ViewStyle>
+}
 
 export class TabView<T extends Route = Route> extends PureComponent<
-    TabViewProps<T>,
-    any
+  TabViewProps<T>,
+  any
 > {}
 
 export type GestureEvent = {
-    nativeEvent: {
-        changedTouches: any[];
-        identifier: number;
-        locationX: number;
-        locationY: number;
-        pageX: number;
-        pageY: number;
-        target: number;
-        timestamp: number;
-        touches: any[];
-    };
-};
+  nativeEvent: {
+    changedTouches: any[]
+    identifier: number
+    locationX: number
+    locationY: number
+    pageX: number
+    pageY: number
+    target: number
+    timestamp: number
+    touches: any[]
+  }
+}
 
 export type GestureState = {
-    stateID: number;
-    moveX: number;
-    moveY: number;
-    x0: number;
-    y0: number;
-    dx: number;
-    dy: number;
-    vx: number;
-    vy: number;
-    numberActiveTouches: number;
-};
+  stateID: number
+  moveX: number
+  moveY: number
+  x0: number
+  y0: number
+  dx: number
+  dy: number
+  vx: number
+  vy: number
+  numberActiveTouches: number
+}
 
-export type GestureHandler = (event: GestureEvent, state: GestureState) => void;
+export type GestureHandler = (event: GestureEvent, state: GestureState) => void
 
-export type PagerPanProps<T extends RouteBase = RouteBase> = SceneRendererProps<
-    T
-> & {
-    configureTransition?: TransitionConfigurator;
-    animationEnabled?: boolean;
-    swipeEnabled?: boolean;
-    swipeDistanceThreshold?: number;
-    swipeVelocityThreshold?: number;
-    onSwipeStart?: GestureHandler;
-    onSwipeEnd?: GestureHandler;
-    children?: ReactNode;
-};
+export type PagerPanProps<
+  T extends RouteBase = RouteBase
+> = SceneRendererProps<T> & {
+  configureTransition?: TransitionConfigurator
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  swipeDistanceThreshold?: number
+  swipeVelocityThreshold?: number
+  onSwipeStart?: GestureHandler
+  onSwipeEnd?: GestureHandler
+  children?: ReactNode
+}
 
 export type DefaultTransitionSpec = {
-    timing: typeof Animated.spring;
-    tension: 300;
-    friction: 35;
-};
+  timing: typeof Animated.spring
+  tension: 300
+  friction: 35
+}
 
 export class PagerPan<T extends Route = Route> extends PureComponent<
-    PagerPanProps<T>,
-    void
+  PagerPanProps<T>,
+  void
 > {
-    static defaultProps: {
-        configureTransition: () => DefaultTransitionSpec;
-        initialLayout: {
-            height: 0;
-            width: 0;
-        };
-        swipeDistanceThreshold: 120;
-        swipeVelocityThreshold: 0.25;
-    };
+  static defaultProps: {
+    configureTransition: () => DefaultTransitionSpec
+    initialLayout: {
+      height: 0
+      width: 0
+    }
+    swipeDistanceThreshold: 120
+    swipeVelocityThreshold: 0.25
+  }
 }
 
 export type ScrollEvent = {
-    nativeEvent: {
-        contentOffset: {
-            x: number;
-            y: number;
-        };
-    };
-};
+  nativeEvent: {
+    contentOffset: {
+      x: number
+      y: number
+    }
+  }
+}
 
 export type PagerScrollProps<
-    T extends RouteBase = RouteBase
+  T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-    animationEnabled?: boolean;
-    swipeEnabled?: boolean;
-    children?: ReactNode;
-};
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  children?: ReactNode
+}
 
 export class PagerScroll<T extends Route = Route> extends PureComponent<
-    PagerScrollProps<T>,
-    any
+PagerScrollProps<T>,
+  any
 > {}
 
 export type PageScrollEvent = {
-    nativeEvent: {
-        position: number;
-        offset: number;
-    };
-};
+  nativeEvent: {
+    position: number
+    offset: number
+  }
+}
 
-export type PageScrollState = 'dragging' | 'settling' | 'idle';
+export type PageScrollState = 'dragging' | 'settling' | 'idle'
 
 export type PagerAndroidProps<
-    T extends RouteBase = RouteBase
+  T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-    animationEnabled?: boolean;
-    swipeEnabled?: boolean;
-    children?: ReactNode;
-};
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  children?: ReactNode
+}
 
 export class PagerAndroid<T extends Route = Route> extends PureComponent<
-    PagerAndroidProps<T>,
-    void
+  PagerAndroidProps<T>,
+  void
 > {}
 
 export type IndicatorProps<
-    T extends RouteBase = RouteBase
+  T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-    width: Animated.Value;
-};
+  width: Animated.Value
+}
 
 export type TabBarProps<T extends RouteBase = RouteBase> = SceneRendererProps<
-    T
+  T
 > & {
-    scrollEnabled?: boolean;
-    pressColor?: string;
-    pressOpacity?: number;
-    getLabelText?: (scene: Scene<T>) => string | undefined | null;
-    renderLabel?: (scene: Scene<T>) => ReactNode;
-    renderIcon?: (scene: Scene<T>) => ReactNode;
-    renderBadge?: (scene: Scene<T>) => ReactNode;
-    renderIndicator?: (props: IndicatorProps<T>) => ReactNode;
-    onTabPress?: (scene: Scene<T>) => void;
-    tabStyle?: StyleProp<ViewStyle>;
-    indicatorStyle?: StyleProp<ViewStyle>;
-    labelStyle?: StyleProp<ViewStyle>;
-    style?: StyleProp<ViewStyle>;
-};
+  scrollEnabled?: boolean
+  pressColor?: string
+  pressOpacity?: number
+  getLabelText?: (scene: Scene<T>) => string | undefined | null
+  renderLabel?: (scene: Scene<T>) => ReactNode
+  renderIcon?: (scene: Scene<T>) => ReactNode
+  renderBadge?: (scene: Scene<T>) => ReactNode
+  renderIndicator?: (props: IndicatorProps<T>) => ReactNode
+  onTabPress?: (scene: Scene<T>) => void
+  tabStyle?: StyleProp<ViewStyle>
+  indicatorStyle?: StyleProp<ViewStyle>
+  labelStyle?: StyleProp<ViewStyle>
+  style?: StyleProp<ViewStyle>
+}
 
 export class TabBar<T extends Route = Route> extends PureComponent<
-    TabBarProps<T>,
-    any
+  TabBarProps<T>,
+  any
 > {}
 
 export function SceneMap(scenes: {
-    [key: string]: ComponentType<any>;
-}): (props: { route: Route }) => ReactNode;
+  [key: string]: ComponentType<any>
+}): (props: { route: Route }) => ReactNode
diff --git a/types/react-native-tab-view/react-native-tab-view-tests.tsx b/types/react-native-tab-view/react-native-tab-view-tests.tsx
index a3e53558ae..a7530b9ec9 100644
--- a/types/react-native-tab-view/react-native-tab-view-tests.tsx
+++ b/types/react-native-tab-view/react-native-tab-view-tests.tsx
@@ -1,59 +1,59 @@
-import { PureComponent, Component } from 'react';
-import { View, StyleSheet } from 'react-native';
+import { PureComponent, Component } from 'react'
+import { View, StyleSheet } from 'react-native'
 import {
-    TabView,
-    TabBar,
-    SceneMap,
-    TabBarProps,
-    RouteBase
-} from 'react-native-tab-view';
+  TabView,
+  TabBar,
+  SceneMap,
+  TabBarProps,
+  RouteBase,
+} from 'react-native-tab-view'
 
 const FirstRoute = () => (
-    <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
-);
+  <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
+)
 
 class SecondRoute extends Component {
-    render() {
-        return (
-            <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
-        );
-    }
+  render() {
+    return (
+      <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
+    );
+  }
 }
 
 class TabViewExample extends PureComponent {
-    state: { index: number; routes: Array<RouteBase & { title: string }> } = {
-        index: 0,
-        routes: [
-            { key: 'first', title: 'First' },
-            { key: 'second', title: 'Second' }
-        ]
-    };
+  state: { index: number; routes: Array<RouteBase & { title: string }> } = {
+    index: 0,
+    routes: [
+      { key: 'first', title: 'First' },
+      { key: 'second', title: 'Second' },
+    ],
+  }
 
-    _handleIndexChange = (index: number) => this.setState({ index });
+  _handleIndexChange = (index: number) => this.setState({ index })
 
-    _renderTabBar = (props: TabBarProps) => <TabBar {...props} />;
+  _renderTabBar = (props: TabBarProps) => <TabBar {...props} />
 
-    _renderScene = SceneMap({
-        first: FirstRoute,
-        second: SecondRoute
-    });
+  _renderScene = SceneMap({
+    first: FirstRoute,
+    second: SecondRoute,
+  })
 
-    render() {
-        return (
-            <TabView
-                style={styles.container}
-                navigationState={this.state}
-                renderScene={this._renderScene}
-                renderTabBar={this._renderTabBar}
-                tabBarPosition="top"
-                onIndexChange={this._handleIndexChange}
-            />
-        );
-    }
+  render() {
+    return (
+      <TabView
+        style={styles.container}
+        navigationState={this.state}
+        renderScene={this._renderScene}
+        renderTabBar={this._renderTabBar}
+        tabBarPosition="top"
+        onIndexChange={this._handleIndexChange}
+      />
+    )
+  }
 }
 
 const styles = StyleSheet.create({
-    container: {
-        flex: 1
-    }
-});
+  container: {
+    flex: 1,
+  },
+})
diff --git a/types/react-router-navigation-core/react-router-navigation-core-tests.tsx b/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
index 08b63cd700..e99fffdc77 100644
--- a/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
+++ b/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
@@ -1,8 +1,8 @@
-import * as React from 'react';
-import { View } from 'react-native';
-import { TabStack, renderSubView } from 'react-router-navigation-core';
-import { TabBarProps, TabProps } from 'react-router-navigation';
-import { TabView } from 'react-native-tab-view';
+import * as React from "react";
+import { View } from "react-native";
+import { TabStack, renderSubView } from "react-router-navigation-core";
+import { TabBarProps, TabProps } from "react-router-navigation";
+import { TabView } from "react-native-tab-view";
 
 type Props = TabBarProps & {
     children?: Array<React.ReactElement<TabProps>>;
diff --git a/types/react-router-navigation/index.d.ts b/types/react-router-navigation/index.d.ts
index 0d74da3084..e43f08e652 100644
--- a/types/react-router-navigation/index.d.ts
+++ b/types/react-router-navigation/index.d.ts
@@ -4,13 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Component, ReactNode, ReactElement, ComponentClass } from 'react';
-import { StyleProp, ViewProps, ViewStyle, TextStyle } from 'react-native';
-import { RouteProps } from 'react-router-navigation-core';
+import { Component, ReactNode, ReactElement, ComponentClass } from "react";
+import { StyleProp, ViewProps, ViewStyle, TextStyle } from "react-native";
+import { RouteProps } from "react-router-navigation-core";
 import {
     NavigationTransitionProps,
     NavigationTransitionSpec
-} from 'react-navigation';
+} from "react-navigation";
 
 /**
  * Navigation
@@ -79,7 +79,7 @@ export interface TabBarProps {
     // <BottomNavigation /> only:
     renderTabIcon?: (props: TabSubViewProps) => ReactNode;
     // <Tabs /> only:
-    tabBarPosition?: 'top' | 'bottom';
+    tabBarPosition?: "top" | "bottom";
     tabBarIndicatorStyle?: StyleProp<ViewStyle>;
 }
 

From 38e7ac8c4312956d0163e5509c9c09718da1fc82 Mon Sep 17 00:00:00 2001
From: Frederick-S <mao_xiaodan@hotmail.com>
Date: Mon, 4 Jun 2018 19:09:54 +0800
Subject: [PATCH 53/64] Add "useFontCache" and "useGlobalCache" to
 SVGOutputProcessor

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

diff --git a/types/mathjax/index.d.ts b/types/mathjax/index.d.ts
index 8c0dc99e1a..aaf4a6109c 100644
--- a/types/mathjax/index.d.ts
+++ b/types/mathjax/index.d.ts
@@ -1030,6 +1030,17 @@ declare namespace MathJax {
         * they were MathML, you might need to set this to true.
         */
         addMMLclasses?: boolean;
+        /*This controls whether the SVG output uses <use> elements to re-use font paths rather than repeat paths every
+        * time. If useGlobalCache (see below) is set to false, this will still reduce duplication of paths while keeping
+        * each SVG self-contained.
+        */
+        useFontCache?: boolean;
+        /*When set to true the SVG Output stores paths (corresponding to “fonts” in the SVG output) in a global SVG
+        * object using <defs> elements so that it can re-use them in all equations via <use> elements (much like a font
+        * file allows re-use of characters across the document). While set to true by default, it will have no effect if
+        * useFontCache is set to false.
+        */
+        useGlobalCache?: boolean;
         /*EqnChunk is the number of equations that will be typeset before they appear on screen. Larger values make for
         * less visual flicker as the equations are drawn, but also mean longer delays before the reader sees anything.
         */

From a57a6639d01603ec9c645fb44cb4855d7fad18bf Mon Sep 17 00:00:00 2001
From: Daniel Munday <mundaymeister@gmail.com>
Date: Mon, 4 Jun 2018 12:14:52 +0100
Subject: [PATCH 54/64] Improve typings for helmet

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

diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts
index a78e768688..0162912d99 100644
--- a/types/helmet/index.d.ts
+++ b/types/helmet/index.d.ts
@@ -20,6 +20,7 @@ declare namespace helmet {
         ieNoOpen?: boolean,
         noCache?: boolean,
         noSniff?: boolean,
+        referrerPolicy?: boolean | IHelmetReferrerPolicyConfiguration,
         xssFilter?: boolean | IHelmetXssFilterConfiguration,
         expectCt?: boolean | IHelmetExpectCtConfiguration,
     }

From 85c6e0995b38136454ff44483ef6ae7ed54ba548 Mon Sep 17 00:00:00 2001
From: Frederick-S <mao_xiaodan@hotmail.com>
Date: Mon, 4 Jun 2018 20:15:49 +0800
Subject: [PATCH 55/64] Test added properties for MathJax

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

diff --git a/types/mathjax/mathjax-tests.ts b/types/mathjax/mathjax-tests.ts
index 619a8fc591..755e3bc4bd 100644
--- a/types/mathjax/mathjax-tests.ts
+++ b/types/mathjax/mathjax-tests.ts
@@ -57,4 +57,11 @@ MathJax.Hub.Config({
   "HTML-CSS": { linebreaks: { automatic: true } },
   CommonHTML: { linebreaks: { automatic: true } },
          SVG: { linebreaks: { automatic: true } }
-});
\ No newline at end of file
+});
+
+MathJax.Hub.Config({
+    SVG: {
+        useFontCache: true,
+        useGlobalCache: true
+    }
+})

From 2705342d4033c068da1f1ec982b46cbb7d0ee12a Mon Sep 17 00:00:00 2001
From: Klaus Kopruch <klaus.kopruch@materna.de>
Date: Mon, 4 Jun 2018 16:34:36 +0200
Subject: [PATCH 56/64] [yup] fix return types of validate and validateSync

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

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 3b45b3fcaa..243cb985c1 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -37,8 +37,8 @@ export interface Schema<T> {
     meta(): any;
     describe(): SchemaDescription;
     concat(schema: this): this;
-    validate(value: T, options?: ValidateOptions): Promise<ValidationError | T>;
-    validateSync(value: T, options?: ValidateOptions): ValidationError | T;
+    validate(value: T, options?: ValidateOptions): Promise<T>;
+    validateSync(value: T, options?: ValidateOptions): T;
     isValid(value: T, options?: any): Promise<boolean>;
     isValidSync(value: T, options?: any): boolean;
     cast(value: any, options?: any): T;
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index 0ce88a6c66..871df0e8e0 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -307,7 +307,7 @@ const testObject: MyInterface = {
     arrayField: ["hi"],
 };
 
-typedSchema.validateSync(testObject); // $ExpectType ValidationError | MyInterface
+typedSchema.validateSync(testObject); // $ExpectType MyInterface
 
 // $ExpectError
 yup.object<MyInterface>({

From b36e585c8ad0888e55f63c197e3f923c3bd38112 Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Mon, 4 Jun 2018 16:40:08 +0200
Subject: [PATCH 57/64] imperium: Update library to support commonJS module

---
 types/imperium/index.d.ts    | 23 ++++++++++++++++++++---
 types/imperium/tsconfig.json |  1 +
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index f6765eea93..d3f4205c05 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -16,6 +16,26 @@ interface RoleParams {
     [key: string]: string;
 }
 
+export const context: string[];
+export const roles: Roles;
+
+// Add new role with specific ImperiumGetAcl
+export function role(roleName: string, getAcl?: GetAcl): Role;
+
+// Check if user has role(s) act like as an OR
+export function is(roleNames: string | string[]): Promise<express.RequestHandler>;
+
+// Check if current user can do action(s)
+export function can(actionS: string | string[] | Action | Action[]): Promise<express.RequestHandler>;
+
+export function evaluateRouteActions(req: express.Request, action: Action[], context: Context): Actions;
+
+export function evaluateRouteAction(req: express.Request, expr: string, key: string, context: Context): string;
+
+export function evaluateUserActions(req: express.Request, roles: Role[]): Promise<Action[]>;
+
+export function evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
+
 export class Imperium {
     constructor()
 
@@ -76,6 +96,3 @@ export class Role {
 export class UnauthorizedError extends Error {
     constructor(message: string, status: number, context: any)
 }
-
-declare const init: Imperium;
-export default init;
diff --git a/types/imperium/tsconfig.json b/types/imperium/tsconfig.json
index c8563caffe..caaa7b74ce 100644
--- a/types/imperium/tsconfig.json
+++ b/types/imperium/tsconfig.json
@@ -9,6 +9,7 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "esModuleInterop": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 7e1a49f0b06650995db4e7c6c3dbc466aa5c50c2 Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Mon, 4 Jun 2018 18:19:29 +0200
Subject: [PATCH 58/64] imperium: Fix typescript errors

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

diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index d3f4205c05..67eace244e 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -8,11 +8,11 @@
 
 import express = require('express');
 
-type GetAcl = (req: express.Request) => Promise<boolean> | Promise<object>;
-type Actions = string[] | string;
-type Context = Array<'params' | 'query' | 'headers' | 'body'>;
+export type GetAcl = (req: express.Request) => Promise<boolean> | Promise<object>;
+export type Actions = string[] | string;
+export type Context = Array<'params' | 'query' | 'headers' | 'body'>;
 // Can contain when key that is evaluated during route action
-interface RoleParams {
+export interface RoleParams {
     [key: string]: string;
 }
 
@@ -62,16 +62,16 @@ export class Imperium {
     evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
 }
 
-interface Roles {
+export interface Roles {
     [key: string]: RoleActions;
 }
 
-interface RoleActions {
+export interface RoleActions {
     actions: Action[];
     getAcl?: GetAcl;
 }
 
-interface Action {
+export interface Action {
     action: string;
     [key: string]: string;
 }

From 85d3c44357c98f26d77364621046f165b22351c1 Mon Sep 17 00:00:00 2001
From: Jinwoo Lee <jinwoo@google.com>
Date: Fri, 1 Jun 2018 11:28:04 -0700
Subject: [PATCH 59/64] node: add `argv0` as one of options for `spawn` and
 `spawnSync`

It is documented for `spawn` in
https://nodejs.org/dist/latest-v10.x/docs/api/child_process.html#child_process_child_process_spawn_command_args_options

It's not documented for `spawnSync`, but since `spawnSync` uses the same
function (normalizeSpawnArguments) for normalizing the options, it
should be there too:
https://github.com/nodejs/node/blob/master/lib/child_process.js#L545
---
 types/node/index.d.ts    | 2 ++
 types/node/node-tests.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index def335cf3c..f7519cb076 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2178,6 +2178,7 @@ declare module "child_process" {
     }
 
     export interface SpawnOptions {
+        argv0?: string;
         cwd?: string;
         env?: any;
         stdio?: any;
@@ -2320,6 +2321,7 @@ declare module "child_process" {
     export function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
 
     export interface SpawnSyncOptions {
+        argv0?: string;
         cwd?: string;
         input?: string | Buffer;
         stdio?: any;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 52ec31af07..740ad1f61a 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -2097,8 +2097,10 @@ namespace child_process_tests {
         childProcess.exec("echo test");
         childProcess.exec("echo test", { windowsHide: true });
         childProcess.spawn("echo", ["test"], { windowsHide: true });
+        childProcess.spawn("echo", ["test"], { windowsHide: true, argv0: "echo-test" });
         childProcess.spawnSync("echo test");
         childProcess.spawnSync("echo test", {windowsVerbatimArguments: false});
+        childProcess.spawnSync("echo test", {windowsVerbatimArguments: false, argv0: "echo-test"});
     }
 
     {

From e8b5a873e053261db904d89c4e101727b8c4396f Mon Sep 17 00:00:00 2001
From: Brian Crowell <brian@fluggo.com>
Date: Mon, 4 Jun 2018 11:40:05 -0500
Subject: [PATCH 60/64] elasticsearch: Fix the _source parameter on mget

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

diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 3236a181a1..35b4e39798 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -206,7 +206,8 @@ client.mget({
   index: 'myindex',
   type: 'mytype',
   body: {
-    ids: [1, 2, 3]
+    ids: [1, 2, 3],
+    _source: ['test']
   }
 }, (error, response) => {
   // ...
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 7973b598ab..2cfd14f689 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -465,7 +465,7 @@ export interface MGetParams extends GenericParams {
     preference?: string;
     realtime?: boolean;
     refresh?: boolean;
-    source?: NameList;
+    _source?: NameList;
     _sourceExclude?: NameList;
     _sourceInclude?: NameList;
     index?: string;

From d7fa07ae582bfdf0f4a98b4c026d4b9f8160b2ce Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Mon, 4 Jun 2018 10:43:53 -0700
Subject: [PATCH 61/64] Create typings for react-native-custom-tabs

---
 types/react-native-custom-tabs/index.d.ts     | 22 +++++++++++++++++
 .../react-native-custom-tabs-tests.ts         | 10 ++++++++
 types/react-native-custom-tabs/tsconfig.json  | 24 +++++++++++++++++++
 types/react-native-custom-tabs/tslint.json    |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/react-native-custom-tabs/index.d.ts
 create mode 100644 types/react-native-custom-tabs/react-native-custom-tabs-tests.ts
 create mode 100644 types/react-native-custom-tabs/tsconfig.json
 create mode 100644 types/react-native-custom-tabs/tslint.json

diff --git a/types/react-native-custom-tabs/index.d.ts b/types/react-native-custom-tabs/index.d.ts
new file mode 100644
index 0000000000..6b41fd9b62
--- /dev/null
+++ b/types/react-native-custom-tabs/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for react-native-custom-tabs 0.1
+// Project: https://github.com/droibit/react-native-custom-tabs/pull/28
+// Definitions by: Phil Nova <https://github.com/philnova>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Animations {
+  startEnter: string;
+  startExit: string;
+  endEnter: string;
+  endExit: string;
+}
+
+export interface CustomTabsOptions {
+  toolbarColor?: string;
+  enableUrlBarHiding?: boolean;
+  showPageTitle?: boolean;
+  enableDefaultShare?: boolean;
+  animations?: Animations;
+  headers?: any;
+}
+
+export function openURL(url: string, options?: CustomTabsOptions): Promise<boolean>;
diff --git a/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts b/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts
new file mode 100644
index 0000000000..86dad3b3ee
--- /dev/null
+++ b/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts
@@ -0,0 +1,10 @@
+import * as ReactNativeCustomTabs from 'react-native-custom-tabs';
+
+const rnt: ReactNativeCustomTabs.CustomTabsOptions = {
+  toolbarColor: 'blue',
+  enableUrlBarHiding: false,
+  showPageTitle: true,
+  enableDefaultShare: true,
+};
+
+const url: Promise<boolean> = ReactNativeCustomTabs.openURL('testurl.com', rnt);
diff --git a/types/react-native-custom-tabs/tsconfig.json b/types/react-native-custom-tabs/tsconfig.json
new file mode 100644
index 0000000000..fcbc50b580
--- /dev/null
+++ b/types/react-native-custom-tabs/tsconfig.json
@@ -0,0 +1,24 @@
+
+{
+  "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+          "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+          "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+      "index.d.ts",
+      "react-native-custom-tabs-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/react-native-custom-tabs/tslint.json b/types/react-native-custom-tabs/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-native-custom-tabs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 342e47182a782ef3c601cdd7406b31c9e6222a5d Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Mon, 4 Jun 2018 12:40:59 -0700
Subject: [PATCH 62/64] Fix project link

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

diff --git a/types/react-native-custom-tabs/index.d.ts b/types/react-native-custom-tabs/index.d.ts
index 6b41fd9b62..ed74ff4303 100644
--- a/types/react-native-custom-tabs/index.d.ts
+++ b/types/react-native-custom-tabs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-native-custom-tabs 0.1
-// Project: https://github.com/droibit/react-native-custom-tabs/pull/28
+// Project: https://github.com/droibit/react-native-custom-tabs
 // Definitions by: Phil Nova <https://github.com/philnova>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 

From c10e4285872d981fba311c07fe7b81c68478bc3b Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Mon, 4 Jun 2018 14:50:11 -0700
Subject: [PATCH 63/64] Office.js typo fix

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 9f8ea6d923..8e62f6d8f8 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -475,7 +475,7 @@ declare namespace Office {
         /**
         * Provides a method for determining what requirement sets are supported on the current host and platform.
         */
-        requirements: RequirmentSetSupport;
+        requirements: RequirementSetSupport;
         /**
          * Gets an object that represents the custom settings or state of a mail add-in saved to a user's mailbox.
          *
@@ -588,7 +588,7 @@ declare namespace Office {
     /**
      * Provides information about what Requirement Sets are supported in current environment.
      */
-    interface RequirmentSetSupport {
+    interface RequirementSetSupport {
         /**
         * Check if the specified requirement set is supported by the host Office application.
         * @param name - Set name; e.g., "MatrixBindings".

From 5a56dd22ba237b83d76ec1e95f2fad1e3f670095 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Tue, 5 Jun 2018 10:20:39 -0600
Subject: [PATCH 64/64] Remove unused type parameter

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

diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 9759d67a9d..fcf614eb92 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -114,13 +114,13 @@ export abstract class BaseConnection extends EventEmitter {
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     describe$: {
         /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
-        <T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
+        (type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
         clear(): void;
     }
-    describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    describe(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     describeGlobal$: {
         /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
-        <T>(callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
+        (callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
         clear(): void;
     }
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;